summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-11-10 16:56:21 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-11-10 16:56:21 +0100
commit7cb543fb742a837c4931513674febaec5e4c1401 (patch)
treeddefe5b9329907818aa6eb3b593f555b29ccb869
parentf6cb0880a4b5d31e398cceb2e2577b6b82f4fffb (diff)
parent71ecaad29d8066a494f516efc5efd80860653fe2 (diff)
merged from lp:~mvo/apt/mvo (that has all the changes from debian-experimental2) and resolved a bunch of conflicts
-rw-r--r--Makefile5
-rw-r--r--apt-inst/contrib/arfile.cc8
-rw-r--r--apt-inst/contrib/arfile.h7
-rw-r--r--apt-inst/contrib/extracttar.cc5
-rw-r--r--apt-inst/contrib/extracttar.h9
-rw-r--r--apt-inst/database.cc11
-rw-r--r--apt-inst/database.h14
-rw-r--r--apt-inst/deb/debfile.cc9
-rw-r--r--apt-inst/deb/debfile.h9
-rw-r--r--apt-inst/deb/dpkgdb.cc4
-rw-r--r--apt-inst/deb/dpkgdb.h13
-rw-r--r--apt-inst/dirstream.cc2
-rw-r--r--apt-inst/extract.cc3
-rw-r--r--apt-inst/extract.h2
-rw-r--r--apt-inst/filelist.cc2
-rw-r--r--apt-inst/filelist.h5
-rw-r--r--apt-inst/makefile2
-rw-r--r--apt-pkg/acquire-item.cc16
-rw-r--r--apt-pkg/acquire-item.h248
-rw-r--r--apt-pkg/acquire-method.cc12
-rw-r--r--apt-pkg/acquire-method.h44
-rw-r--r--apt-pkg/acquire-worker.cc16
-rw-r--r--apt-pkg/acquire-worker.h12
-rw-r--r--apt-pkg/acquire.cc10
-rw-r--r--apt-pkg/acquire.h36
-rw-r--r--apt-pkg/algorithms.cc27
-rw-r--r--apt-pkg/algorithms.h7
-rw-r--r--apt-pkg/aptconfiguration.cc18
-rw-r--r--apt-pkg/cachefile.cc19
-rw-r--r--apt-pkg/cachefile.h10
-rw-r--r--apt-pkg/cachefilter.cc2
-rw-r--r--apt-pkg/cacheiterators.h7
-rw-r--r--apt-pkg/cacheset.cc13
-rw-r--r--apt-pkg/cacheset.h13
-rw-r--r--apt-pkg/cdrom.cc7
-rw-r--r--apt-pkg/cdrom.h41
-rw-r--r--apt-pkg/clean.cc17
-rw-r--r--apt-pkg/clean.h4
-rw-r--r--apt-pkg/contrib/cdromutl.cc8
-rw-r--r--apt-pkg/contrib/cdromutl.h12
-rw-r--r--apt-pkg/contrib/cmndline.cc33
-rw-r--r--apt-pkg/contrib/cmndline.h4
-rw-r--r--apt-pkg/contrib/configuration.cc5
-rw-r--r--apt-pkg/contrib/configuration.h46
-rw-r--r--apt-pkg/contrib/crc-16.cc4
-rw-r--r--apt-pkg/contrib/crc-16.h2
-rw-r--r--apt-pkg/contrib/error.cc5
-rw-r--r--apt-pkg/contrib/fileutl.cc40
-rw-r--r--apt-pkg/contrib/fileutl.h77
-rw-r--r--apt-pkg/contrib/hashes.cc38
-rw-r--r--apt-pkg/contrib/hashes.h23
-rw-r--r--apt-pkg/contrib/hashsum.cc11
-rw-r--r--apt-pkg/contrib/hashsum_template.h19
-rw-r--r--apt-pkg/contrib/md5.cc5
-rw-r--r--apt-pkg/contrib/md5.h5
-rw-r--r--apt-pkg/contrib/mmap.cc26
-rw-r--r--apt-pkg/contrib/mmap.h13
-rw-r--r--apt-pkg/contrib/netrc.cc4
-rw-r--r--apt-pkg/contrib/netrc.h6
-rw-r--r--apt-pkg/contrib/progress.cc14
-rw-r--r--apt-pkg/contrib/progress.h30
-rw-r--r--apt-pkg/contrib/sha1.cc5
-rw-r--r--apt-pkg/contrib/sha1.h5
-rw-r--r--apt-pkg/contrib/sha2.h6
-rw-r--r--apt-pkg/contrib/sha2_internal.cc17
-rw-r--r--apt-pkg/contrib/strutl.cc49
-rw-r--r--apt-pkg/contrib/strutl.h109
-rw-r--r--apt-pkg/deb/debindexfile.cc2
-rw-r--r--apt-pkg/deb/debindexfile.h68
-rw-r--r--apt-pkg/deb/deblistparser.cc29
-rw-r--r--apt-pkg/deb/deblistparser.h25
-rw-r--r--apt-pkg/deb/debmetaindex.cc12
-rw-r--r--apt-pkg/deb/debmetaindex.h43
-rw-r--r--apt-pkg/deb/debrecords.cc10
-rw-r--r--apt-pkg/deb/debrecords.h30
-rw-r--r--apt-pkg/deb/debsrcrecords.cc49
-rw-r--r--apt-pkg/deb/debsrcrecords.h23
-rw-r--r--apt-pkg/deb/debsystem.cc9
-rw-r--r--apt-pkg/deb/debsystem.h4
-rw-r--r--apt-pkg/deb/debversion.cc31
-rw-r--r--apt-pkg/deb/debversion.h30
-rw-r--r--apt-pkg/deb/dpkgpm.cc177
-rw-r--r--apt-pkg/deb/dpkgpm.h21
-rw-r--r--apt-pkg/depcache.cc15
-rw-r--r--apt-pkg/depcache.h11
-rw-r--r--apt-pkg/edsp.cc13
-rw-r--r--apt-pkg/edsp.h11
-rw-r--r--apt-pkg/edsp/edspindexfile.cc3
-rw-r--r--apt-pkg/edsp/edspindexfile.h3
-rw-r--r--apt-pkg/edsp/edsplistparser.cc10
-rw-r--r--apt-pkg/edsp/edsplistparser.h13
-rw-r--r--apt-pkg/edsp/edspsystem.cc7
-rw-r--r--apt-pkg/indexcopy.cc29
-rw-r--r--apt-pkg/indexcopy.h41
-rw-r--r--apt-pkg/indexfile.cc12
-rw-r--r--apt-pkg/indexfile.h14
-rw-r--r--apt-pkg/indexrecords.cc18
-rw-r--r--apt-pkg/indexrecords.h33
-rw-r--r--apt-pkg/init.cc30
-rw-r--r--apt-pkg/init.h17
-rw-r--r--apt-pkg/metaindex.h23
-rw-r--r--apt-pkg/orderlist.cc80
-rw-r--r--apt-pkg/orderlist.h20
-rw-r--r--apt-pkg/packagemanager.cc471
-rw-r--r--apt-pkg/packagemanager.h19
-rw-r--r--apt-pkg/pkgcache.cc11
-rw-r--r--apt-pkg/pkgcache.h16
-rw-r--r--apt-pkg/pkgcachegen.cc191
-rw-r--r--apt-pkg/pkgcachegen.h59
-rw-r--r--apt-pkg/pkgrecords.cc8
-rw-r--r--apt-pkg/pkgrecords.h27
-rw-r--r--apt-pkg/pkgsystem.cc2
-rw-r--r--apt-pkg/pkgsystem.h6
-rw-r--r--apt-pkg/policy.cc9
-rw-r--r--apt-pkg/policy.h20
-rw-r--r--apt-pkg/sourcelist.cc10
-rw-r--r--apt-pkg/sourcelist.h6
-rw-r--r--apt-pkg/srcrecords.cc7
-rw-r--r--apt-pkg/srcrecords.h33
-rw-r--r--apt-pkg/tagfile.cc25
-rw-r--r--apt-pkg/tagfile.h12
-rw-r--r--apt-pkg/vendor.cc8
-rw-r--r--apt-pkg/vendor.h22
-rw-r--r--apt-pkg/vendorlist.cc7
-rw-r--r--apt-pkg/vendorlist.h17
-rw-r--r--apt-pkg/version.cc2
-rw-r--r--apt-pkg/version.h11
-rw-r--r--apt-pkg/versionmatch.cc6
-rw-r--r--apt-pkg/versionmatch.h26
-rw-r--r--buildlib/config.h.in3
-rw-r--r--buildlib/defaults.mak4
-rw-r--r--cmdline/acqprogress.cc20
-rw-r--r--cmdline/acqprogress.h4
-rw-r--r--cmdline/apt-cache.cc16
-rw-r--r--cmdline/apt-cdrom.cc10
-rw-r--r--cmdline/apt-config.cc8
-rw-r--r--cmdline/apt-dump-solver.cc1
-rw-r--r--cmdline/apt-extracttemplates.cc6
-rw-r--r--cmdline/apt-get.cc93
-rw-r--r--cmdline/apt-internal-solver.cc2
-rwxr-xr-xcmdline/apt-key2
-rw-r--r--cmdline/apt-mark.cc8
-rw-r--r--cmdline/apt-sortpkgs.cc9
-rw-r--r--configure.in8
-rw-r--r--debian/changelog312
-rw-r--r--debian/control4
-rw-r--r--debian/libapt-inst1.4.install (renamed from debian/libapt-inst1.3.install)0
-rw-r--r--debian/libapt-inst1.4.symbols (renamed from debian/libapt-inst1.3.symbols)2
-rw-r--r--debian/libapt-pkg4.12.install (renamed from debian/libapt-pkg4.11.install)0
-rw-r--r--debian/libapt-pkg4.12.symbols (renamed from debian/libapt-pkg4.11.symbols)254
-rwxr-xr-xdebian/rules7
-rw-r--r--doc/apt-get.8.xml2
-rw-r--r--doc/apt.conf.5.xml2
-rw-r--r--doc/po/apt-doc.pot1273
-rw-r--r--doc/po/de.po1945
-rw-r--r--doc/po/es.po1544
-rw-r--r--doc/po/fr.po1590
-rw-r--r--doc/po/it.po1307
-rw-r--r--doc/po/ja.po1517
-rw-r--r--doc/po/pl.po1496
-rw-r--r--doc/po/pt.po1541
-rw-r--r--doc/po/pt_BR.po1324
-rw-r--r--ftparchive/apt-ftparchive.cc21
-rw-r--r--ftparchive/cachedb.cc31
-rw-r--r--ftparchive/cachedb.h36
-rw-r--r--ftparchive/contents.cc10
-rw-r--r--ftparchive/contents.h11
-rw-r--r--ftparchive/multicompress.cc18
-rw-r--r--ftparchive/multicompress.h13
-rw-r--r--ftparchive/override.cc22
-rw-r--r--ftparchive/writer.cc28
-rw-r--r--ftparchive/writer.h11
-rw-r--r--methods/bzip2.cc9
-rw-r--r--methods/cdrom.cc3
-rw-r--r--methods/connect.cc20
-rw-r--r--methods/connect.h5
-rw-r--r--methods/copy.cc5
-rw-r--r--methods/file.cc9
-rw-r--r--methods/ftp.cc17
-rw-r--r--methods/ftp.h18
-rw-r--r--methods/gpgv.cc10
-rw-r--r--methods/gzip.cc6
-rw-r--r--methods/http.cc44
-rw-r--r--methods/http.h55
-rw-r--r--methods/http_main.cc2
-rw-r--r--methods/https.cc8
-rw-r--r--methods/https.h3
-rw-r--r--methods/mirror.cc7
-rw-r--r--methods/mirror.h25
-rw-r--r--methods/rfc2553emu.cc4
-rw-r--r--methods/rred.cc9
-rw-r--r--methods/rsh.cc42
-rw-r--r--methods/rsh.h24
-rw-r--r--po/apt-all.pot1422
-rw-r--r--po/fr.po2
-rw-r--r--test/Makefile16
-rw-r--r--test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages25
-rw-r--r--test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release13
-rw-r--r--test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg7
-rw-r--r--test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages25
-rw-r--r--test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release13
-rw-r--r--test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg7
-rw-r--r--test/authReliability/sources.list.failure2
-rw-r--r--test/authReliability/sources.list.good2
-rw-r--r--test/fake-status16
-rw-r--r--test/integration/framework66
-rw-r--r--test/integration/makefile10
-rwxr-xr-xtest/integration/run-tests21
-rwxr-xr-xtest/integration/test-apt-get-download11
-rwxr-xr-xtest/integration/test-bug-254770-segfault-if-cache-not-buildable1
-rwxr-xr-xtest/integration/test-bug-407511-fail-invalid-default-release23
-rwxr-xr-xtest/integration/test-bug-590041-prefer-non-virtual-packages2
-rwxr-xr-xtest/integration/test-bug-590438-broken-provides-thanks-to-remove-order2
-rwxr-xr-xtest/integration/test-bug-595691-empty-and-broken-archive-files10
-rwxr-xr-xtest/integration/test-bug-601016-description-translation2
-rwxr-xr-xtest/integration/test-bug-612099-multiarch-conflicts7
-rwxr-xr-xtest/integration/test-bug-618288-multiarch-same-lockstep15
-rwxr-xr-xtest/integration/test-bug-624218-Translation-file-handling87
-rwxr-xr-xtest/integration/test-bug-633350-do-not-kill-last-char-in-Release2
-rwxr-xr-xtest/integration/test-compressed-indexes17
-rwxr-xr-xtest/integration/test-conflicts-loop35
-rwxr-xr-xtest/integration/test-disappearing-packages22
-rwxr-xr-xtest/integration/test-hashsum-verification2
-rwxr-xr-xtest/integration/test-package-reinstallation23
-rwxr-xr-xtest/integration/test-policy-pinning65
-rwxr-xr-xtest/integration/test-provides-gone-with-upgrade26
-rwxr-xr-xtest/integration/test-releasefile-valid-until5
-rwxr-xr-xtest/integration/test-releasefile-verification3
-rwxr-xr-xtest/integration/test-ubuntu-bug-761175-remove-purge8
-rw-r--r--test/interactive-helper/extract-control.cc (renamed from test/extract-control.cc)1
-rw-r--r--test/interactive-helper/makefile (renamed from test/makefile)19
-rw-r--r--test/interactive-helper/mthdcat.cc (renamed from test/mthdcat.cc)0
-rw-r--r--test/interactive-helper/networkless-install-fixes/README (renamed from test/networkless-install-fixes/README)0
-rw-r--r--test/interactive-helper/networkless-install-fixes/sources.test.list (renamed from test/networkless-install-fixes/sources.test.list)0
-rwxr-xr-xtest/interactive-helper/networkless-install-fixes/test.sh (renamed from test/networkless-install-fixes/test.sh)0
-rw-r--r--test/interactive-helper/rpmver.cc (renamed from test/rpmver.cc)0
-rw-r--r--test/interactive-helper/test_udevcdrom.cc (renamed from test/test_udevcdrom.cc)8
-rw-r--r--test/interactive-helper/testdeb.cc (renamed from test/testdeb.cc)0
-rw-r--r--test/interactive-helper/testextract.cc (renamed from test/testextract.cc)2
-rw-r--r--test/libapt/assert.h27
-rw-r--r--test/libapt/compareversion_test.cc7
-rw-r--r--test/libapt/getlanguages_test.cc12
-rw-r--r--test/libapt/getlistoffilesindir_test.cc2
-rw-r--r--test/libapt/hashsums_test.cc2
-rw-r--r--test/libapt/makefile4
-rw-r--r--test/libapt/parsedepends_test.cc4
-rwxr-xr-xtest/libapt/run-tests29
-rw-r--r--test/libapt/strutil_test.cc2
-rw-r--r--test/libapt/versions.lst (renamed from test/versions.lst)0
-rw-r--r--test/local-repo/Packages11
-rw-r--r--test/local-repo/Packages.gzbin269 -> 0 bytes
-rw-r--r--test/local-repo/Packages.gz.savebin603 -> 0 bytes
-rw-r--r--test/local-repo/Release13
-rw-r--r--test/local-repo/Release.gpg7
-rw-r--r--test/local-repo/gdebi-test4.debbin2306 -> 0 bytes
-rwxr-xr-xtest/pre-upload-check.py266
-rw-r--r--test/scratch.cc105
-rwxr-xr-xtest/test-indexes.sh235
-rw-r--r--test/testkeys/mvo.key1182
-rw-r--r--test/testsources.list/sources.list.all-gpg-broken2
-rw-r--r--test/testsources.list/sources.list.all-gpg-ok2
-rw-r--r--test/testsources.list/sources.list.all-release-broken1
-rw-r--r--test/testsources.list/sources.list.all-release-ok1
-rw-r--r--test/testsources.list/sources.list.all-validuntil-broken1
-rw-r--r--test/testsources.list/sources.list.md5-package-broken2
-rw-r--r--test/testsources.list/sources.list.md5-package-ok2
-rw-r--r--test/testsources.list/sources.list.md5-release-broken1
-rw-r--r--test/testsources.list/sources.list.md5-release-ok1
-rw-r--r--test/testsources.list/sources.list.sha1-release-broken1
-rw-r--r--test/testsources.list/sources.list.sha1-release-ok1
-rw-r--r--test/testsources.list/sources.list.sha256-package-broken2
-rw-r--r--test/testsources.list/sources.list.sha256-package-ok2
-rw-r--r--test/testsources.list/sources.list.sha256-release-broken1
-rw-r--r--test/testsources.list/sources.list.sha256-release-ok1
274 files changed, 12294 insertions, 9827 deletions
diff --git a/Makefile b/Makefile
index 664caca41..9a47014c3 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ endif
.PHONY: default
default: startup all
-.PHONY: headers library clean veryclean all binary program doc
-all headers library clean veryclean binary program doc dirs:
+.PHONY: headers library clean veryclean all binary program doc test
+all headers library clean veryclean binary program doc dirs test:
$(MAKE) -C apt-pkg $@
$(MAKE) -C apt-inst $@
$(MAKE) -C methods $@
@@ -19,6 +19,7 @@ all headers library clean veryclean binary program doc dirs:
$(MAKE) -C dselect $@
$(MAKE) -C doc $@
$(MAKE) -C po $@
+ $(MAKE) -C test $@
# Some very common aliases
.PHONY: maintainer-clean dist-clean distclean pristine sanity
diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc
index 8018f4d30..2dee1a40d 100644
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -14,13 +14,17 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/arfile.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
#include <apt-pkg/error.h>
#include <stdlib.h>
- /*}}}*/
+
#include <apti18n.h>
+ /*}}}*/
struct ARArchive::MemberHeader
{
@@ -112,7 +116,7 @@ bool ARArchive::LoadHeaders()
{
unsigned int I = sizeof(Head.Name) - 1;
for (; Head.Name[I] == ' ' || Head.Name[I] == '/'; I--);
- Memb->Name = string(Head.Name,I+1);
+ Memb->Name = std::string(Head.Name,I+1);
}
// Account for the AR header alignment
diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h
index 7f6c68302..2be1323d1 100644
--- a/apt-inst/contrib/arfile.h
+++ b/apt-inst/contrib/arfile.h
@@ -17,7 +17,8 @@
#include <string>
-#include <apt-pkg/fileutl.h>
+
+class FileFd;
class ARArchive
{
@@ -49,12 +50,12 @@ class ARArchive
struct ARArchive::Member
{
// Fields from the header
- string Name;
+ std::string Name;
unsigned long MTime;
unsigned long UID;
unsigned long GID;
unsigned long Mode;
- unsigned long Size;
+ unsigned long long Size;
// Location of the data.
unsigned long Start;
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 01b6b3836..12919a7cd 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -16,8 +16,10 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include <apt-pkg/extracttar.h>
+#include<config.h>
+#include <apt-pkg/dirstream.h>
+#include <apt-pkg/extracttar.h>
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/configuration.h>
@@ -28,6 +30,7 @@
#include <signal.h>
#include <fcntl.h>
#include <iostream>
+
#include <apti18n.h>
/*}}}*/
diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index 42f8ef534..8754e8dcc 100644
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -15,11 +15,10 @@
#define PKGLIB_EXTRACTTAR_H
#include <apt-pkg/fileutl.h>
-#include <apt-pkg/dirstream.h>
-#include <algorithm>
+#include <string>
-using std::min;
+class pkgDirStream;
class ExtractTar
{
@@ -38,7 +37,7 @@ class ExtractTar
int GZPid;
FileFd InFd;
bool Eof;
- string DecompressProg;
+ std::string DecompressProg;
// Fork and reap gzip
bool StartGzip();
@@ -48,7 +47,7 @@ class ExtractTar
bool Go(pkgDirStream &Stream);
- ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram);
+ ExtractTar(FileFd &Fd,unsigned long Max,std::string DecompressionProgram);
virtual ~ExtractTar();
};
diff --git a/apt-inst/database.cc b/apt-inst/database.cc
index a5020f3d7..da7613491 100644
--- a/apt-inst/database.cc
+++ b/apt-inst/database.cc
@@ -8,14 +8,18 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/database.h>
+#include <apt-pkg/filelist.h>
+#include <apt-pkg/pkgcachegen.h>
/*}}}*/
// DataBase::GetMetaTmp - Get the temp dir /*{{{*/
// ---------------------------------------------------------------------
/* This re-initializes the meta temporary directory if it hasn't yet
been inited for this cycle. The flag is the emptyness of MetaDir */
-bool pkgDataBase::GetMetaTmp(string &Dir)
+bool pkgDataBase::GetMetaTmp(std::string &Dir)
{
if (MetaDir.empty() == true)
if (InitMetaTmp(MetaDir) == false)
@@ -24,3 +28,8 @@ bool pkgDataBase::GetMetaTmp(string &Dir)
return true;
}
/*}}}*/
+pkgDataBase::~pkgDataBase()
+{
+ delete Cache;
+ delete FList;
+}
diff --git a/apt-inst/database.h b/apt-inst/database.h
index ef45bc2d6..ccfee3797 100644
--- a/apt-inst/database.h
+++ b/apt-inst/database.h
@@ -21,17 +21,21 @@
#ifndef PKGLIB_DATABASE_H
#define PKGLIB_DATABASE_H
-#include <apt-pkg/filelist.h>
#include <apt-pkg/pkgcachegen.h>
+#include <string>
+
+class pkgFLCache;
+class OpProgress;
+
class pkgDataBase
{
protected:
pkgCacheGenerator *Cache;
pkgFLCache *FList;
- string MetaDir;
- virtual bool InitMetaTmp(string &Dir) = 0;
+ std::string MetaDir;
+ virtual bool InitMetaTmp(std::string &Dir) = 0;
public:
@@ -40,13 +44,13 @@ class pkgDataBase
inline pkgFLCache &GetFLCache() {return *FList;};
inline pkgCacheGenerator &GetGenerator() {return *Cache;};
- bool GetMetaTmp(string &Dir);
+ bool GetMetaTmp(std::string &Dir);
virtual bool ReadyFileList(OpProgress &Progress) = 0;
virtual bool ReadyPkgCache(OpProgress &Progress) = 0;
virtual bool LoadChanges() = 0;
pkgDataBase() : Cache(0), FList(0) {};
- virtual ~pkgDataBase() {delete Cache; delete FList;};
+ virtual ~pkgDataBase();
};
#endif
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index a40cd1ae8..4bd065cf8 100644
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -16,6 +16,9 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
+#include <apt-pkg/database.h>
#include <apt-pkg/debfile.h>
#include <apt-pkg/extracttar.h>
#include <apt-pkg/error.h>
@@ -105,8 +108,8 @@ bool debDebFile::ExtractControl(pkgDataBase &DB)
return false;
// Get into the temporary directory
- string Cwd = SafeGetCWD();
- string Tmp;
+ std::string Cwd = SafeGetCWD();
+ std::string Tmp;
if (DB.GetMetaTmp(Tmp) == false)
return false;
if (chdir(Tmp.c_str()) != 0)
@@ -172,7 +175,7 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream)
pkgCache::VerIterator debDebFile::MergeControl(pkgDataBase &DB)
{
// Open the control file
- string Tmp;
+ std::string Tmp;
if (DB.GetMetaTmp(Tmp) == false)
return pkgCache::VerIterator(DB.GetCache());
FileFd Fd(Tmp + "control",FileFd::ReadOnly);
diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index 6b9f8ffc8..2c4734f9e 100644
--- a/apt-inst/deb/debfile.h
+++ b/apt-inst/deb/debfile.h
@@ -25,9 +25,12 @@
#include <apt-pkg/arfile.h>
-#include <apt-pkg/database.h>
#include <apt-pkg/dirstream.h>
#include <apt-pkg/tagfile.h>
+#include <apt-pkg/pkgcache.h>
+
+class FileFd;
+class pkgDataBase;
class debDebFile
{
@@ -68,7 +71,7 @@ class debDebFile::MemControlExtract : public pkgDirStream
char *Control;
pkgTagSection Section;
unsigned long Length;
- string Member;
+ std::string Member;
// Members from DirStream
virtual bool DoItem(Item &Itm,int &Fd);
@@ -81,7 +84,7 @@ class debDebFile::MemControlExtract : public pkgDirStream
bool TakeControl(const void *Data,unsigned long Size);
MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {};
- MemControlExtract(string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};
+ MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};
~MemControlExtract() {delete [] Control;};
};
/*}}}*/
diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc
index a75cf59ca..819c123f6 100644
--- a/apt-inst/deb/dpkgdb.cc
+++ b/apt-inst/deb/dpkgdb.cc
@@ -13,12 +13,16 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/dpkgdb.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
#include <apt-pkg/progress.h>
#include <apt-pkg/tagfile.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/filelist.h>
#include <stdio.h>
#include <errno.h>
diff --git a/apt-inst/deb/dpkgdb.h b/apt-inst/deb/dpkgdb.h
index 125845f96..f28563a93 100644
--- a/apt-inst/deb/dpkgdb.h
+++ b/apt-inst/deb/dpkgdb.h
@@ -22,17 +22,22 @@
#include <apt-pkg/database.h>
+#include <string>
+
+class DynamicMMap;
+class OpProgress;
+
class debDpkgDB : public pkgDataBase
{
protected:
-
- string AdminDir;
+
+ std::string AdminDir;
DynamicMMap *CacheMap;
DynamicMMap *FileMap;
unsigned long DiverInode;
signed long DiverTime;
-
- virtual bool InitMetaTmp(string &Dir);
+
+ virtual bool InitMetaTmp(std::string &Dir);
bool ReadFList(OpProgress &Progress);
bool ReadDiversions();
bool ReadConfFiles();
diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index 9b6a56848..bb0bf96c1 100644
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -11,6 +11,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/dirstream.h>
#include <apt-pkg/error.h>
diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc
index cd8edb27a..29e163028 100644
--- a/apt-inst/extract.cc
+++ b/apt-inst/extract.cc
@@ -44,9 +44,12 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/extract.h>
#include <apt-pkg/error.h>
#include <apt-pkg/debversion.h>
+#include <apt-pkg/fileutl.h>
#include <sys/stat.h>
#include <stdio.h>
diff --git a/apt-inst/extract.h b/apt-inst/extract.h
index 71222983c..7143fa409 100644
--- a/apt-inst/extract.h
+++ b/apt-inst/extract.h
@@ -33,7 +33,7 @@ class pkgExtract : public pkgDirStream
bool HandleOverwrites(pkgFLCache::NodeIterator Nde,
bool DiverCheck = false);
- bool CheckDirReplace(string Dir,unsigned int Depth = 0);
+ bool CheckDirReplace(std::string Dir,unsigned int Depth = 0);
public:
diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc
index 060aa53d7..879c07855 100644
--- a/apt-inst/filelist.cc
+++ b/apt-inst/filelist.cc
@@ -32,6 +32,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/filelist.h>
#include <apt-pkg/mmap.h>
#include <apt-pkg/error.h>
diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h
index c74a310e4..0405d61df 100644
--- a/apt-inst/filelist.h
+++ b/apt-inst/filelist.h
@@ -28,9 +28,10 @@
#ifndef PKGLIB_FILELIST_H
#define PKGLIB_FILELIST_H
+#include <apt-pkg/mmap.h>
#include <cstring>
-#include <apt-pkg/mmap.h>
+#include <string>
class pkgFLCache
{
@@ -48,7 +49,7 @@ class pkgFLCache
class DiverIterator;
protected:
- string CacheFile;
+ std::string CacheFile;
DynamicMMap &Map;
map_ptrloc LastTreeLookup;
unsigned long LastLookupSize;
diff --git a/apt-inst/makefile b/apt-inst/makefile
index 32d231240..1b9cc2676 100644
--- a/apt-inst/makefile
+++ b/apt-inst/makefile
@@ -14,7 +14,7 @@ include ../buildlib/libversion.mak
# The library name
LIBRARY=apt-inst
-MAJOR=1.3
+MAJOR=1.4
MINOR=0
SLIBS=$(PTHREADLIB) -lapt-pkg
APT_DOMAIN:=libapt-inst$(MAJOR)
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index d14342c02..453fce109 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -13,6 +13,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/aptconfiguration.h>
@@ -23,9 +25,9 @@
#include <apt-pkg/md5.h>
#include <apt-pkg/sha1.h>
#include <apt-pkg/tagfile.h>
+#include <apt-pkg/indexrecords.h>
+#include <apt-pkg/metaindex.h>
-#include <apti18n.h>
-
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
@@ -33,6 +35,8 @@
#include <sstream>
#include <stdio.h>
#include <ctime>
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -808,6 +812,13 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, IndexTarget const *Target,
if (CompressionExtension.empty() == false)
CompressionExtension.erase(CompressionExtension.end()-1);
+ // only verify non-optional targets, see acquire-item.h for a FIXME
+ // to make this more flexible
+ if (Target->IsOptional())
+ Verify = false;
+ else
+ Verify = true;
+
Init(Target->URI, Target->Description, Target->ShortDesc);
}
/*}}}*/
@@ -905,6 +916,7 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
/* Verify the index file for correctness (all indexes must
* have a Package field) (LP: #346386) (Closes: #627642) */
+ if (Verify == true)
{
FileFd fd(DestFile, FileFd::ReadOnly);
pkgTagSection sec;
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 60ec55fcb..27b8e887b 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -21,13 +21,9 @@
#define PKGLIB_ACQUIRE_ITEM_H
#include <apt-pkg/acquire.h>
-#include <apt-pkg/indexfile.h>
-#include <apt-pkg/vendor.h>
-#include <apt-pkg/sourcelist.h>
-#include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/indexrecords.h>
#include <apt-pkg/hashes.h>
#include <apt-pkg/weakptr.h>
+#include <apt-pkg/pkgcache.h>
/** \addtogroup acquire
* @{
@@ -35,6 +31,10 @@
* \file acquire-item.h
*/
+class indexRecords;
+class pkgRecords;
+class pkgSourceList;
+
/** \brief Represents the process by which a pkgAcquire object should {{{
* retrieve a file or a collection of files.
*
@@ -74,7 +74,7 @@ class pkgAcquire::Item : public WeakPointable
* \param To The new name of #From. If #To exists it will be
* overwritten.
*/
- void Rename(string From,string To);
+ void Rename(std::string From,std::string To);
public:
@@ -109,7 +109,7 @@ class pkgAcquire::Item : public WeakPointable
/** \brief Contains a textual description of the error encountered
* if #Status is #StatError or #StatAuthError.
*/
- string ErrorText;
+ std::string ErrorText;
/** \brief The size of the object to fetch. */
unsigned long long FileSize;
@@ -143,7 +143,7 @@ class pkgAcquire::Item : public WeakPointable
* download progress indicator's overall statistics.
*/
bool Local;
- string UsedMirror;
+ std::string UsedMirror;
/** \brief The number of fetch queues into which this item has been
* inserted.
@@ -158,7 +158,7 @@ class pkgAcquire::Item : public WeakPointable
/** \brief The name of the file into which the retrieved object
* will be written.
*/
- string DestFile;
+ std::string DestFile;
/** \brief Invoked by the acquire worker when the object couldn't
* be fetched.
@@ -173,7 +173,7 @@ class pkgAcquire::Item : public WeakPointable
*
* \sa pkgAcqMethod
*/
- virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
/** \brief Invoked by the acquire worker when the object was
* fetched successfully.
@@ -194,7 +194,7 @@ class pkgAcquire::Item : public WeakPointable
*
* \sa pkgAcqMethod
*/
- virtual void Done(string Message,unsigned long long Size,string Hash,
+ virtual void Done(std::string Message,unsigned long long Size,std::string Hash,
pkgAcquire::MethodConfig *Cnf);
/** \brief Invoked when the worker starts to fetch this object.
@@ -206,7 +206,7 @@ class pkgAcquire::Item : public WeakPointable
*
* \sa pkgAcqMethod
*/
- virtual void Start(string Message,unsigned long long Size);
+ virtual void Start(std::string Message,unsigned long long Size);
/** \brief Custom headers to be sent to the fetch process.
*
@@ -216,18 +216,18 @@ class pkgAcquire::Item : public WeakPointable
* line, so they should (if nonempty) have a leading newline and
* no trailing newline.
*/
- virtual string Custom600Headers() {return string();};
+ virtual std::string Custom600Headers() {return std::string();};
/** \brief A "descriptive" URI-like string.
*
* \return a URI that should be used to describe what is being fetched.
*/
- virtual string DescURI() = 0;
+ virtual std::string DescURI() = 0;
/** \brief Short item description.
*
* \return a brief description of the object being fetched.
*/
- virtual string ShortDesc() {return DescURI();}
+ virtual std::string ShortDesc() {return DescURI();}
/** \brief Invoked by the worker when the download is completely done. */
virtual void Finished() {};
@@ -237,7 +237,7 @@ class pkgAcquire::Item : public WeakPointable
* \return the HashSum of this object, if applicable; otherwise, an
* empty string.
*/
- virtual string HashSum() {return string();};
+ virtual std::string HashSum() {return std::string();};
/** \return the acquire process with which this item is associated. */
pkgAcquire *GetOwner() {return Owner;};
@@ -253,7 +253,7 @@ class pkgAcquire::Item : public WeakPointable
*
* \param FailCode A short failure string that is send
*/
- void ReportMirrorFailure(string FailCode);
+ void ReportMirrorFailure(std::string FailCode);
/** \brief Initialize an item.
@@ -278,10 +278,10 @@ class pkgAcquire::Item : public WeakPointable
/** \brief Information about an index patch (aka diff). */ /*{{{*/
struct DiffInfo {
/** The filename of the diff. */
- string file;
+ std::string file;
/** The sha1 hash of the diff. */
- string sha1;
+ std::string sha1;
/** The size of the diff. */
unsigned long size;
@@ -308,12 +308,12 @@ class pkgAcqSubIndex : public pkgAcquire::Item
public:
// Specialized action members
- virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(string Message,unsigned long long Size,string Md5Hash,
+ virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash,
pkgAcquire::MethodConfig *Cnf);
- virtual string DescURI() {return Desc.URI;};
- virtual string Custom600Headers();
- virtual bool ParseIndex(string const &IndexFile);
+ virtual std::string DescURI() {return Desc.URI;};
+ virtual std::string Custom600Headers();
+ virtual bool ParseIndex(std::string const &IndexFile);
/** \brief Create a new pkgAcqSubIndex.
*
@@ -327,8 +327,8 @@ class pkgAcqSubIndex : public pkgAcquire::Item
*
* \param ExpectedHash The list file's MD5 signature.
*/
- pkgAcqSubIndex(pkgAcquire *Owner, string const &URI,string const &URIDesc,
- string const &ShortDesc, HashString const &ExpectedHash);
+ pkgAcqSubIndex(pkgAcquire *Owner, std::string const &URI,std::string const &URIDesc,
+ std::string const &ShortDesc, HashString const &ExpectedHash);
};
/*}}}*/
/** \brief An item that is responsible for fetching an index file of {{{
@@ -352,7 +352,7 @@ class pkgAcqDiffIndex : public pkgAcquire::Item
/** \brief The URI of the index file to recreate at our end (either
* by downloading it or by applying partial patches).
*/
- string RealURI;
+ std::string RealURI;
/** \brief The Hash that the real index file should have after
* all patches have been applied.
@@ -362,20 +362,20 @@ class pkgAcqDiffIndex : public pkgAcquire::Item
/** \brief The index file which will be patched to generate the new
* file.
*/
- string CurrentPackagesFile;
+ std::string CurrentPackagesFile;
/** \brief A description of the Packages file (stored in
* pkgAcquire::ItemDesc::Description).
*/
- string Description;
+ std::string Description;
public:
// Specialized action members
- virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(string Message,unsigned long long Size,string Md5Hash,
+ virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash,
pkgAcquire::MethodConfig *Cnf);
- virtual string DescURI() {return RealURI + "Index";};
- virtual string Custom600Headers();
+ virtual std::string DescURI() {return RealURI + "Index";};
+ virtual std::string Custom600Headers();
/** \brief Parse the Index file for a set of Packages diffs.
*
@@ -387,7 +387,7 @@ class pkgAcqDiffIndex : public pkgAcquire::Item
* \return \b true if the Index file was successfully parsed, \b
* false otherwise.
*/
- bool ParseDiffIndex(string IndexDiffFile);
+ bool ParseDiffIndex(std::string IndexDiffFile);
/** \brief Create a new pkgAcqDiffIndex.
@@ -402,8 +402,8 @@ class pkgAcqDiffIndex : public pkgAcquire::Item
*
* \param ExpectedHash The list file's MD5 signature.
*/
- pkgAcqDiffIndex(pkgAcquire *Owner,string URI,string URIDesc,
- string ShortDesc, HashString ExpectedHash);
+ pkgAcqDiffIndex(pkgAcquire *Owner,std::string URI,std::string URIDesc,
+ std::string ShortDesc, HashString ExpectedHash);
};
/*}}}*/
/** \brief An item that is responsible for fetching all the patches {{{
@@ -460,7 +460,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
/** \brief The URI of the package index file that is being
* reconstructed.
*/
- string RealURI;
+ std::string RealURI;
/** \brief The HashSum of the package index file that is being
* reconstructed.
@@ -468,7 +468,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
HashString ExpectedHash;
/** A description of the file being downloaded. */
- string Description;
+ std::string Description;
/** The patches that remain to be downloaded, including the patch
* being downloaded right now. This list should be ordered so
@@ -478,10 +478,10 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
* dictionary instead of relying on ordering and stripping them
* off the front?
*/
- vector<DiffInfo> available_patches;
+ std::vector<DiffInfo> available_patches;
/** Stop applying patches when reaching that sha1 */
- string ServerSha1;
+ std::string ServerSha1;
/** The current status of this patch. */
enum DiffState
@@ -506,11 +506,11 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
* This method will fall back to downloading the whole index file
* outright; its arguments are ignored.
*/
- virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(string Message,unsigned long long Size,string Md5Hash,
+ virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash,
pkgAcquire::MethodConfig *Cnf);
- virtual string DescURI() {return RealURI + "Index";};
+ virtual std::string DescURI() {return RealURI + "Index";};
/** \brief Create an index diff item.
*
@@ -534,10 +534,10 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
* should be ordered so that each diff appears before any diff
* that depends on it.
*/
- pkgAcqIndexDiffs(pkgAcquire *Owner,string URI,string URIDesc,
- string ShortDesc, HashString ExpectedHash,
- string ServerSha1,
- vector<DiffInfo> diffs=vector<DiffInfo>());
+ pkgAcqIndexDiffs(pkgAcquire *Owner,std::string URI,std::string URIDesc,
+ std::string ShortDesc, HashString ExpectedHash,
+ std::string ServerSha1,
+ std::vector<DiffInfo> diffs=std::vector<DiffInfo>());
};
/*}}}*/
/** \brief An acquire item that is responsible for fetching an index {{{
@@ -559,6 +559,16 @@ class pkgAcqIndex : public pkgAcquire::Item
*/
bool Erase;
+ /** \brief Verify for correctness by checking if a "Package"
+ * tag is found in the index. This can be set to
+ * false for optional index targets
+ *
+ */
+ // FIXME: instead of a bool it should use a verify string that will
+ // then be used in the pkgAcqIndex::Done method to ensure that
+ // the downloaded file contains the expected tag
+ bool Verify;
+
/** \brief The download request that is currently being
* processed.
*/
@@ -567,7 +577,7 @@ class pkgAcqIndex : public pkgAcquire::Item
/** \brief The object that is actually being fetched (minus any
* compression-related extensions).
*/
- string RealURI;
+ std::string RealURI;
/** \brief The expected hashsum of the decompressed index file. */
HashString ExpectedHash;
@@ -575,17 +585,17 @@ class pkgAcqIndex : public pkgAcquire::Item
/** \brief The compression-related file extensions that are being
* added to the downloaded file one by one if first fails (e.g., "gz bz2").
*/
- string CompressionExtension;
+ std::string CompressionExtension;
public:
// Specialized action members
- virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(string Message,unsigned long long Size,string Md5Hash,
+ virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash,
pkgAcquire::MethodConfig *Cnf);
- virtual string Custom600Headers();
- virtual string DescURI() {return Desc.URI;};
- virtual string HashSum() {return ExpectedHash.toStr(); };
+ virtual std::string Custom600Headers();
+ virtual std::string DescURI() {return Desc.URI;};
+ virtual std::string HashSum() {return ExpectedHash.toStr(); };
/** \brief Create a pkgAcqIndex.
*
@@ -606,12 +616,12 @@ class pkgAcqIndex : public pkgAcquire::Item
* default is ".lzma" or ".bz2" (if the needed binaries are present)
* fallback is ".gz" or none.
*/
- pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc,
- string ShortDesc, HashString ExpectedHash,
- string compressExt="");
+ pkgAcqIndex(pkgAcquire *Owner,std::string URI,std::string URIDesc,
+ std::string ShortDesc, HashString ExpectedHash,
+ std::string compressExt="");
pkgAcqIndex(pkgAcquire *Owner, struct IndexTarget const * const Target,
HashString const &ExpectedHash, indexRecords const *MetaIndexParser);
- void Init(string const &URI, string const &URIDesc, string const &ShortDesc);
+ void Init(std::string const &URI, std::string const &URIDesc, std::string const &ShortDesc);
};
/*}}}*/
/** \brief An acquire item that is responsible for fetching a {{{
@@ -625,8 +635,8 @@ class pkgAcqIndexTrans : public pkgAcqIndex
{
public:
- virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- virtual string Custom600Headers();
+ virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual std::string Custom600Headers();
/** \brief Create a pkgAcqIndexTrans.
*
@@ -639,8 +649,8 @@ class pkgAcqIndexTrans : public pkgAcqIndex
*
* \param ShortDesc A brief description of this index file.
*/
- pkgAcqIndexTrans(pkgAcquire *Owner,string URI,string URIDesc,
- string ShortDesc);
+ pkgAcqIndexTrans(pkgAcquire *Owner,std::string URI,std::string URIDesc,
+ std::string ShortDesc);
pkgAcqIndexTrans(pkgAcquire *Owner, struct IndexTarget const * const Target,
HashString const &ExpectedHash, indexRecords const *MetaIndexParser);
};
@@ -650,18 +660,18 @@ class IndexTarget
{
public:
/** \brief A URI from which the index file can be downloaded. */
- string URI;
+ std::string URI;
/** \brief A description of the index file. */
- string Description;
+ std::string Description;
/** \brief A shorter description of the index file. */
- string ShortDesc;
+ std::string ShortDesc;
/** \brief The key by which this index file should be
* looked up within the meta signature file.
*/
- string MetaKey;
+ std::string MetaKey;
virtual bool IsOptional() const {
return false;
@@ -708,7 +718,7 @@ class pkgAcqMetaSig : public pkgAcquire::Item
{
protected:
/** \brief The last good signature file */
- string LastGoodSig;
+ std::string LastGoodSig;
/** \brief The fetch request that is currently being processed. */
pkgAcquire::ItemDesc Desc;
@@ -717,20 +727,20 @@ class pkgAcqMetaSig : public pkgAcquire::Item
* never modified; it is used to determine the file that is being
* downloaded.
*/
- string RealURI;
+ std::string RealURI;
/** \brief The URI of the meta-index file to be fetched after the signature. */
- string MetaIndexURI;
+ std::string MetaIndexURI;
/** \brief A "URI-style" description of the meta-index file to be
* fetched after the signature.
*/
- string MetaIndexURIDesc;
+ std::string MetaIndexURIDesc;
/** \brief A brief description of the meta-index file to be fetched
* after the signature.
*/
- string MetaIndexShortDesc;
+ std::string MetaIndexShortDesc;
/** \brief A package-system-specific parser for the meta-index file. */
indexRecords* MetaIndexParser;
@@ -740,21 +750,21 @@ class pkgAcqMetaSig : public pkgAcquire::Item
*
* \todo Why a list of pointers instead of a list of structs?
*/
- const vector<struct IndexTarget*>* IndexTargets;
+ const std::vector<struct IndexTarget*>* IndexTargets;
public:
// Specialized action members
- virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(string Message,unsigned long long Size,string Md5Hash,
+ virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash,
pkgAcquire::MethodConfig *Cnf);
- virtual string Custom600Headers();
- virtual string DescURI() {return RealURI; };
+ virtual std::string Custom600Headers();
+ virtual std::string DescURI() {return RealURI; };
/** \brief Create a new pkgAcqMetaSig. */
- pkgAcqMetaSig(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesc,
- string MetaIndexURI, string MetaIndexURIDesc, string MetaIndexShortDesc,
- const vector<struct IndexTarget*>* IndexTargets,
+ pkgAcqMetaSig(pkgAcquire *Owner,std::string URI,std::string URIDesc, std::string ShortDesc,
+ std::string MetaIndexURI, std::string MetaIndexURIDesc, std::string MetaIndexShortDesc,
+ const std::vector<struct IndexTarget*>* IndexTargets,
indexRecords* MetaIndexParser);
};
/*}}}*/
@@ -777,17 +787,17 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
/** \brief The URI that is actually being downloaded; never
* modified by pkgAcqMetaIndex.
*/
- string RealURI;
+ std::string RealURI;
/** \brief The file in which the signature for this index was stored.
*
* If empty, the signature and the md5sums of the individual
* indices will not be checked.
*/
- string SigFile;
+ std::string SigFile;
/** \brief The index files to download. */
- const vector<struct IndexTarget*>* IndexTargets;
+ const std::vector<struct IndexTarget*>* IndexTargets;
/** \brief The parser for the meta-index file. */
indexRecords* MetaIndexParser;
@@ -803,7 +813,7 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
*
* \return \b true if no fatal errors were encountered.
*/
- bool VerifyVendor(string Message);
+ bool VerifyVendor(std::string Message);
/** \brief Called when a file is finished being retrieved.
*
@@ -814,7 +824,7 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
* \param Message The message block received from the fetch
* subprocess.
*/
- void RetrievalDone(string Message);
+ void RetrievalDone(std::string Message);
/** \brief Called when authentication succeeded.
*
@@ -825,7 +835,7 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
* \param Message The message block received from the fetch
* subprocess.
*/
- void AuthDone(string Message);
+ void AuthDone(std::string Message);
/** \brief Starts downloading the individual index files.
*
@@ -840,17 +850,17 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
public:
// Specialized action members
- virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(string Message,unsigned long long Size, string Hash,
+ virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual void Done(std::string Message,unsigned long long Size, std::string Hash,
pkgAcquire::MethodConfig *Cnf);
- virtual string Custom600Headers();
- virtual string DescURI() {return RealURI; };
+ virtual std::string Custom600Headers();
+ virtual std::string DescURI() {return RealURI; };
/** \brief Create a new pkgAcqMetaIndex. */
pkgAcqMetaIndex(pkgAcquire *Owner,
- string URI,string URIDesc, string ShortDesc,
- string SigFile,
- const vector<struct IndexTarget*>* IndexTargets,
+ std::string URI,std::string URIDesc, std::string ShortDesc,
+ std::string SigFile,
+ const std::vector<struct IndexTarget*>* IndexTargets,
indexRecords* MetaIndexParser);
};
/*}}}*/
@@ -858,33 +868,33 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
class pkgAcqMetaClearSig : public pkgAcqMetaIndex
{
/** \brief The URI of the meta-index file for the detached signature */
- string MetaIndexURI;
+ std::string MetaIndexURI;
/** \brief A "URI-style" description of the meta-index file */
- string MetaIndexURIDesc;
+ std::string MetaIndexURIDesc;
/** \brief A brief description of the meta-index file */
- string MetaIndexShortDesc;
+ std::string MetaIndexShortDesc;
/** \brief The URI of the detached meta-signature file if the clearsigned one failed. */
- string MetaSigURI;
+ std::string MetaSigURI;
/** \brief A "URI-style" description of the meta-signature file */
- string MetaSigURIDesc;
+ std::string MetaSigURIDesc;
/** \brief A brief description of the meta-signature file */
- string MetaSigShortDesc;
+ std::string MetaSigShortDesc;
public:
- void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- virtual string Custom600Headers();
+ void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual std::string Custom600Headers();
/** \brief Create a new pkgAcqMetaClearSig. */
pkgAcqMetaClearSig(pkgAcquire *Owner,
- string const &URI, string const &URIDesc, string const &ShortDesc,
- string const &MetaIndexURI, string const &MetaIndexURIDesc, string const &MetaIndexShortDesc,
- string const &MetaSigURI, string const &MetaSigURIDesc, string const &MetaSigShortDesc,
- const vector<struct IndexTarget*>* IndexTargets,
+ std::string const &URI, std::string const &URIDesc, std::string const &ShortDesc,
+ std::string const &MetaIndexURI, std::string const &MetaIndexURIDesc, std::string const &MetaIndexShortDesc,
+ std::string const &MetaSigURI, std::string const &MetaSigURIDesc, std::string const &MetaSigShortDesc,
+ const std::vector<struct IndexTarget*>* IndexTargets,
indexRecords* MetaIndexParser);
};
/*}}}*/
@@ -918,7 +928,7 @@ class pkgAcqArchive : public pkgAcquire::Item
/** \brief A location in which the actual filename of the package
* should be stored.
*/
- string &StoreFilename;
+ std::string &StoreFilename;
/** \brief The next file for this version to try to download. */
pkgCache::VerFileIterator Vf;
@@ -940,13 +950,13 @@ class pkgAcqArchive : public pkgAcquire::Item
public:
- virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(string Message,unsigned long long Size,string Hash,
+ virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual void Done(std::string Message,unsigned long long Size,std::string Hash,
pkgAcquire::MethodConfig *Cnf);
- virtual string DescURI() {return Desc.URI;};
- virtual string ShortDesc() {return Desc.ShortDesc;};
+ virtual std::string DescURI() {return Desc.URI;};
+ virtual std::string ShortDesc() {return Desc.ShortDesc;};
virtual void Finished();
- virtual string HashSum() {return ExpectedHash.toStr(); };
+ virtual std::string HashSum() {return ExpectedHash.toStr(); };
virtual bool IsTrusted();
/** \brief Create a new pkgAcqArchive.
@@ -969,7 +979,7 @@ class pkgAcqArchive : public pkgAcquire::Item
*/
pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources,
pkgRecords *Recs,pkgCache::VerIterator const &Version,
- string &StoreFilename);
+ std::string &StoreFilename);
};
/*}}}*/
/** \brief Retrieve an arbitrary file to the current directory. {{{
@@ -997,12 +1007,12 @@ class pkgAcqFile : public pkgAcquire::Item
public:
// Specialized action members
- virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(string Message,unsigned long long Size,string CalcHash,
+ virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual void Done(std::string Message,unsigned long long Size,std::string CalcHash,
pkgAcquire::MethodConfig *Cnf);
- virtual string DescURI() {return Desc.URI;};
- virtual string HashSum() {return ExpectedHash.toStr(); };
- virtual string Custom600Headers();
+ virtual std::string DescURI() {return Desc.URI;};
+ virtual std::string HashSum() {return ExpectedHash.toStr(); };
+ virtual std::string Custom600Headers();
/** \brief Create a new pkgAcqFile object.
*
@@ -1035,9 +1045,9 @@ class pkgAcqFile : public pkgAcquire::Item
* is the absolute name to which the file should be downloaded.
*/
- pkgAcqFile(pkgAcquire *Owner, string URI, string Hash, unsigned long long Size,
- string Desc, string ShortDesc,
- const string &DestDir="", const string &DestFilename="",
+ pkgAcqFile(pkgAcquire *Owner, std::string URI, std::string Hash, unsigned long long Size,
+ std::string Desc, std::string ShortDesc,
+ const std::string &DestDir="", const std::string &DestFilename="",
bool IsIndexFile=false);
};
/*}}}*/
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 25c6c674d..2041fd9e9 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -15,6 +15,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
@@ -289,12 +291,12 @@ bool pkgAcqMethod::Configuration(string Message)
I += Length + 1;
for (; I < MsgEnd && *I == ' '; I++);
- const char *Equals = I;
- for (; Equals < MsgEnd && *Equals != '='; Equals++);
- const char *End = Equals;
- for (; End < MsgEnd && *End != '\n'; End++);
- if (End == Equals)
+ const char *Equals = (const char*) memchr(I, '=', MsgEnd - I);
+ if (Equals == NULL)
return false;
+ const char *End = (const char*) memchr(Equals, '\n', MsgEnd - Equals);
+ if (End == NULL)
+ End = MsgEnd;
Cnf.Set(DeQuoteString(string(I,Equals-I)),
DeQuoteString(string(Equals+1,End-Equals-1)));
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 6551170c4..c3f042ee0 100644
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -20,11 +20,11 @@
#ifndef PKGLIB_ACQUIRE_METHOD_H
#define PKGLIB_ACQUIRE_METHOD_H
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/strutl.h>
-
#include <stdarg.h>
+#include <string>
+#include <vector>
+
class Hashes;
class pkgAcqMethod
{
@@ -34,8 +34,8 @@ class pkgAcqMethod
{
FetchItem *Next;
- string Uri;
- string DestFile;
+ std::string Uri;
+ std::string DestFile;
time_t LastModified;
bool IndexFile;
bool FailIgnore;
@@ -43,14 +43,14 @@ class pkgAcqMethod
struct FetchResult
{
- string MD5Sum;
- string SHA1Sum;
- string SHA256Sum;
- string SHA512Sum;
- vector<string> GPGVOutput;
+ std::string MD5Sum;
+ std::string SHA1Sum;
+ std::string SHA256Sum;
+ std::string SHA512Sum;
+ std::vector<std::string> GPGVOutput;
time_t LastModified;
bool IMSHit;
- string Filename;
+ std::string Filename;
unsigned long long Size;
unsigned long long ResumePoint;
@@ -59,25 +59,25 @@ class pkgAcqMethod
};
// State
- vector<string> Messages;
+ std::vector<std::string> Messages;
FetchItem *Queue;
FetchItem *QueueBack;
- string FailReason;
- string UsedMirror;
- string IP;
+ std::string FailReason;
+ std::string UsedMirror;
+ std::string IP;
// Handlers for messages
- virtual bool Configuration(string Message);
+ virtual bool Configuration(std::string Message);
virtual bool Fetch(FetchItem * /*Item*/) {return true;};
// Outgoing messages
void Fail(bool Transient = false);
- inline void Fail(const char *Why, bool Transient = false) {Fail(string(Why),Transient);};
- virtual void Fail(string Why, bool Transient = false);
+ inline void Fail(const char *Why, bool Transient = false) {Fail(std::string(Why),Transient);};
+ virtual void Fail(std::string Why, bool Transient = false);
virtual void URIStart(FetchResult &Res);
virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0);
- bool MediaFail(string Required,string Drive);
+ bool MediaFail(std::string Required,std::string Drive);
virtual void Exit() {};
void PrintStatus(char const * const header, const char* Format, va_list &args) const;
@@ -91,11 +91,11 @@ class pkgAcqMethod
void Log(const char *Format,...);
void Status(const char *Format,...);
- void Redirect(const string &NewURI);
+ void Redirect(const std::string &NewURI);
int Run(bool Single = false);
- inline void SetFailReason(string Msg) {FailReason = Msg;};
- inline void SetIP(string aIP) {IP = aIP;};
+ inline void SetFailReason(std::string Msg) {FailReason = Msg;};
+ inline void SetIP(std::string aIP) {IP = aIP;};
pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
virtual ~pkgAcqMethod() {};
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 3e1fd98db..3bb977e14 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -12,6 +12,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/acquire-worker.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/configuration.h>
@@ -19,18 +21,18 @@
#include <apt-pkg/fileutl.h>
#include <apt-pkg/strutl.h>
-#include <apti18n.h>
-
#include <iostream>
#include <sstream>
#include <fstream>
-
+
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <signal.h>
#include <stdio.h>
#include <errno.h>
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -256,9 +258,9 @@ bool pkgAcquire::Worker::RunMessages()
CurrentItem = Itm;
CurrentSize = 0;
- TotalSize = atoi(LookupTag(Message,"Size","0").c_str());
- ResumePoint = atoi(LookupTag(Message,"Resume-Point","0").c_str());
- Itm->Owner->Start(Message,atoi(LookupTag(Message,"Size","0").c_str()));
+ TotalSize = strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10);
+ ResumePoint = strtoull(LookupTag(Message,"Resume-Point","0").c_str(), NULL, 10);
+ Itm->Owner->Start(Message,strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10));
// Display update before completion
if (Log != 0 && Log->MorePulses == true)
@@ -287,7 +289,7 @@ bool pkgAcquire::Worker::RunMessages()
Log->Pulse(Owner->GetOwner());
OwnerQ->ItemDone(Itm);
- unsigned long long const ServerSize = atoll(LookupTag(Message,"Size","0").c_str());
+ unsigned long long const ServerSize = strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10);
if (TotalSize != 0 && ServerSize != TotalSize)
_error->Warning("Size of file %s is not what the server reported %s %llu",
Owner->DestFile.c_str(), LookupTag(Message,"Size","0").c_str(),TotalSize);
diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h
index ce19091e4..848a6bad7 100644
--- a/apt-pkg/acquire-worker.h
+++ b/apt-pkg/acquire-worker.h
@@ -79,7 +79,7 @@ class pkgAcquire::Worker : public WeakPointable
*
* \todo Doesn't this duplicate Config->Access?
*/
- string Access;
+ std::string Access;
/** \brief The PID of the subprocess. */
pid_t Process;
@@ -118,13 +118,13 @@ class pkgAcquire::Worker : public WeakPointable
/** \brief The raw text values of messages received from the
* worker, in sequence.
*/
- vector<string> MessageQueue;
+ std::vector<std::string> MessageQueue;
/** \brief Buffers pending writes to the subprocess.
*
* \todo Wouldn't a std::dequeue be more appropriate?
*/
- string OutQueue;
+ std::string OutQueue;
/** \brief Common code for the constructor.
*
@@ -183,7 +183,7 @@ class pkgAcquire::Worker : public WeakPointable
*
* \return \b true.
*/
- bool Capabilities(string Message);
+ bool Capabilities(std::string Message);
/** \brief Send a 601 Configuration message (containing the APT
* configuration) to the subprocess.
@@ -214,7 +214,7 @@ class pkgAcquire::Worker : public WeakPointable
* 603 Media Changed, with the Failed field set to \b true if the
* user cancelled the media change).
*/
- bool MediaChange(string Message);
+ bool MediaChange(std::string Message);
/** \brief Invoked when the worked process dies unexpectedly.
*
@@ -242,7 +242,7 @@ class pkgAcquire::Worker : public WeakPointable
/** \brief The most recent status string received from the
* subprocess.
*/
- string Status;
+ std::string Status;
/** \brief How many bytes of the file have been downloaded. Zero
* if the current progress of the file cannot be determined.
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 8c00748b2..cdc3fba4b 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -13,6 +13,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/acquire.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/acquire-worker.h>
@@ -21,8 +23,6 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
-#include <apti18n.h>
-
#include <iostream>
#include <sstream>
#include <stdio.h>
@@ -30,6 +30,8 @@
#include <dirent.h>
#include <sys/time.h>
#include <errno.h>
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -445,6 +447,10 @@ pkgAcquire::Worker *pkgAcquire::WorkerStep(Worker *I)
if it is part of the download set. */
bool pkgAcquire::Clean(string Dir)
{
+ // non-existing directories are by definition clean…
+ if (DirectoryExists(Dir) == false)
+ return true;
+
DIR *D = opendir(Dir.c_str());
if (D == 0)
return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index ae555df22..93772403d 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -72,10 +72,6 @@
#include <vector>
#include <string>
-using std::vector;
-using std::string;
-
-
#include <sys/time.h>
#include <unistd.h>
@@ -107,8 +103,8 @@ class pkgAcquire
friend class Item;
friend class Queue;
- typedef vector<Item *>::iterator ItemIterator;
- typedef vector<Item *>::const_iterator ItemCIterator;
+ typedef std::vector<Item *>::iterator ItemIterator;
+ typedef std::vector<Item *>::const_iterator ItemCIterator;
protected:
@@ -117,7 +113,7 @@ class pkgAcquire
* This is built monotonically as items are created and only
* emptied when the download shuts down.
*/
- vector<Item *> Items;
+ std::vector<Item *> Items;
/** \brief The head of the list of active queues.
*
@@ -202,7 +198,7 @@ class pkgAcquire
* \return the string-name of the queue in which a fetch request
* for the given URI should be placed.
*/
- string QueueName(string URI,MethodConfig const *&Config);
+ std::string QueueName(std::string URI,MethodConfig const *&Config);
/** \brief Build up the set of file descriptors upon which select() should
* block.
@@ -248,7 +244,7 @@ class pkgAcquire
*
* \return the method whose name is Access, or \b NULL if no such method exists.
*/
- MethodConfig *GetConfig(string Access);
+ MethodConfig *GetConfig(std::string Access);
/** \brief Provides information on how a download terminated. */
enum RunResult {
@@ -319,7 +315,7 @@ class pkgAcquire
*
* \return \b true if the directory exists and is readable.
*/
- bool Clean(string Dir);
+ bool Clean(std::string Dir);
/** \return the total size in bytes of all the items included in
* this download.
@@ -347,7 +343,7 @@ class pkgAcquire
* only one Acquire class is in action at the time or an empty string
* if no lock file should be used.
*/
- bool Setup(pkgAcquireStatus *Progress = NULL, string const &Lock = "");
+ bool Setup(pkgAcquireStatus *Progress = NULL, std::string const &Lock = "");
void SetLog(pkgAcquireStatus *Progress) { Log = Progress; }
@@ -372,11 +368,11 @@ class pkgAcquire
struct pkgAcquire::ItemDesc : public WeakPointable
{
/** \brief The URI from which to download this item. */
- string URI;
+ std::string URI;
/** brief A description of this item. */
- string Description;
+ std::string Description;
/** brief A shorter description of this item. */
- string ShortDesc;
+ std::string ShortDesc;
/** brief The underlying item which is to be downloaded. */
Item *Owner;
};
@@ -420,7 +416,7 @@ class pkgAcquire::Queue
};
/** \brief The name of this queue. */
- string Name;
+ std::string Name;
/** \brief The head of the list of items contained in this queue.
*
@@ -475,7 +471,7 @@ class pkgAcquire::Queue
* \return the first item in the queue whose URI is #URI and that
* is being downloaded by #Owner.
*/
- QItem *FindItem(string URI,pkgAcquire::Worker *Owner);
+ QItem *FindItem(std::string URI,pkgAcquire::Worker *Owner);
/** Presumably this should start downloading an item?
*
@@ -538,7 +534,7 @@ class pkgAcquire::Queue
* \param Name The name of the new queue.
* \param Owner The download process that owns the new queue.
*/
- Queue(string Name,pkgAcquire *Owner);
+ Queue(std::string Name,pkgAcquire *Owner);
/** Shut down all the worker processes associated with this queue
* and empty the queue.
@@ -603,10 +599,10 @@ struct pkgAcquire::MethodConfig
MethodConfig *Next;
/** \brief The name of this acquire method (e.g., http). */
- string Access;
+ std::string Access;
/** \brief The implementation version of this acquire method. */
- string Version;
+ std::string Version;
/** \brief If \b true, only one download queue should be created for this
* method.
@@ -748,7 +744,7 @@ class pkgAcquireStatus
* \todo This is a horrible blocking monster; it should be CPSed
* with prejudice.
*/
- virtual bool MediaChange(string Media,string Drive) = 0;
+ virtual bool MediaChange(std::string Media,std::string Drive) = 0;
/** \brief Invoked when an item is confirmed to be up-to-date.
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 08d1f8cb7..f7a333606 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -14,6 +14,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/algorithms.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
@@ -21,14 +23,17 @@
#include <apt-pkg/sptr.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/edsp.h>
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/progress.h>
-#include <apti18n.h>
#include <sys/types.h>
#include <cstdlib>
#include <algorithm>
#include <iostream>
-
#include <stdio.h>
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -1030,7 +1035,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
if (BrokenFix == false || DoUpgrade(I) == false)
{
// Consider other options
- if (InOr == false)
+ if (InOr == false || Cache[I].Garbage == true)
{
if (Debug == true)
clog << " Removing " << I.FullName(false) << " rather than change " << Start.TargetPkg().FullName(false) << endl;
@@ -1204,7 +1209,6 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
return true;
}
/*}}}*/
-
// ProblemResolver::BreaksInstOrPolicy - Check if the given pkg is broken/*{{{*/
// ---------------------------------------------------------------------
/* This checks if the given package is broken either by a hard dependency
@@ -1216,19 +1220,26 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
*/
bool pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator I)
{
-
// a broken install is always a problem
if (Cache[I].InstBroken() == true)
+ {
+ if (Debug == true)
+ std::clog << " Dependencies are not satisfied for " << I << std::endl;
return true;
+ }
// a newly broken policy (recommends/suggests) is a problem
if (Cache[I].NowPolicyBroken() == false &&
Cache[I].InstPolicyBroken() == true)
+ {
+ if (Debug == true)
+ std::clog << " Policy breaks with upgrade of " << I << std::endl;
return true;
-
+ }
+
return false;
}
-
+ /*}}}*/
// ProblemResolver::ResolveByKeep - Resolve problems using keep /*{{{*/
// ---------------------------------------------------------------------
/* This is the work horse of the soft upgrade routine. It is very gental
@@ -1434,7 +1445,7 @@ void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List)
qsort(List,Count,sizeof(*List),PrioComp);
}
/*}}}*/
-// CacheFile::ListUpdate - update the cache files /*{{{*/
+// ListUpdate - update the cache files /*{{{*/
// ---------------------------------------------------------------------
/* This is a simple wrapper to update the cache. it will fetch stuff
* from the network (or any other sources defined in sources.list)
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 86d5fbd53..948fe1103 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -33,11 +33,10 @@
#include <apt-pkg/packagemanager.h>
#include <apt-pkg/depcache.h>
-#include <apt-pkg/acquire.h>
#include <iostream>
-using std::ostream;
+class pkgAcquireStatus;
class pkgSimulate : public pkgPackageManager /*{{{*/
{
@@ -63,13 +62,13 @@ class pkgSimulate : public pkgPackageManager /*{{{*/
pkgDepCache::ActionGroup group;
// The Actuall installation implementation
- virtual bool Install(PkgIterator Pkg,string File);
+ virtual bool Install(PkgIterator Pkg,std::string File);
virtual bool Configure(PkgIterator Pkg);
virtual bool Remove(PkgIterator Pkg,bool Purge);
private:
void ShortBreaks();
- void Describe(PkgIterator iPkg,ostream &out,bool Current,bool Candidate);
+ void Describe(PkgIterator iPkg,std::ostream &out,bool Current,bool Candidate);
public:
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 6ec5fa03a..7441b452c 100644
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -8,6 +8,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
@@ -57,10 +59,10 @@ const Configuration::getCompressionTypes(bool const &Cached) {
if ((*o).empty() == true)
continue;
// ignore types we have no method ready to use
- if (_config->Exists(string("Acquire::CompressionTypes::").append(*o)) == false)
+ if (_config->Exists(std::string("Acquire::CompressionTypes::").append(*o)) == false)
continue;
// ignore types we have no app ready to use
- string const appsetting = string("Dir::Bin::").append(*o);
+ std::string const appsetting = std::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)
@@ -81,7 +83,7 @@ const Configuration::getCompressionTypes(bool const &Cached) {
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);
+ std::string const appsetting = std::string("Dir::Bin::").append(Types->Value);
if (appsetting.empty() == false && _config->Exists(appsetting) == true) {
std::string const app = _config->FindFile(appsetting.c_str(), "");
if (app.empty() == false && FileExists(app) == false)
@@ -93,7 +95,7 @@ const Configuration::getCompressionTypes(bool const &Cached) {
// add the special "uncompressed" type
if (std::find(types.begin(), types.end(), "uncompressed") == types.end())
{
- string const uncompr = _config->FindFile("Dir::Bin::uncompressed", "");
+ std::string const uncompr = _config->FindFile("Dir::Bin::uncompressed", "");
if (uncompr.empty() == true || FileExists(uncompr) == true)
types.push_back("uncompressed");
}
@@ -140,7 +142,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) {
string const name = Ent->d_name;
size_t const foundDash = name.rfind("-");
- size_t const foundUnderscore = name.rfind("_");
+ size_t const foundUnderscore = name.rfind("_", foundDash);
if (foundDash == string::npos || foundUnderscore == string::npos ||
foundDash <= foundUnderscore ||
name.substr(foundUnderscore+1, foundDash-(foundUnderscore+1)) != "Translation")
@@ -151,7 +153,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
// Skip unusual files, like backups or that alike
string::const_iterator s = c.begin();
for (;s != c.end(); ++s) {
- if (isalpha(*s) == 0)
+ if (isalpha(*s) == 0 && *s != '_')
break;
}
if (s != c.end())
@@ -232,6 +234,8 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
codes = environment;
} else if (forceLang != "none")
codes.push_back(forceLang);
+ else //if (forceLang == "none")
+ builtin.clear();
allCodes = codes;
for (std::vector<string>::const_iterator b = builtin.begin();
b != builtin.end(); ++b)
@@ -439,7 +443,7 @@ Configuration::Compressor::Compressor(char const *name, char const *extension,
char const *binary,
char const *compressArg, char const *uncompressArg,
unsigned short const cost) {
- std::string const config = string("APT:Compressor::").append(name).append("::");
+ std::string const config = std::string("APT:Compressor::").append(name).append("::");
Name = _config->Find(std::string(config).append("Name"), name);
Extension = _config->Find(std::string(config).append("Extension"), extension);
Binary = _config->Find(std::string(config).append("Binary"), binary);
diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 964c5bd8b..1b8d91a44 100644
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -12,6 +12,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/cachefile.h>
#include <apt-pkg/error.h>
#include <apt-pkg/sourcelist.h>
@@ -21,7 +23,8 @@
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/fileutl.h>
-
+#include <apt-pkg/progress.h>
+
#include <apti18n.h>
/*}}}*/
// CacheFile::CacheFile - Constructor /*{{{*/
@@ -163,6 +166,20 @@ bool pkgCacheFile::Open(OpProgress *Progress, bool WithLock)
return true;
}
/*}}}*/
+// CacheFile::RemoveCaches - remove all cache files from disk /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgCacheFile::RemoveCaches()
+{
+ std::string const pkgcache = _config->FindFile("Dir::cache::pkgcache");
+ std::string const srcpkgcache = _config->FindFile("Dir::cache::srcpkgcache");
+
+ if (pkgcache.empty() == false && RealFileExists(pkgcache) == true)
+ unlink(pkgcache.c_str());
+ if (srcpkgcache.empty() == false && RealFileExists(srcpkgcache) == true)
+ unlink(srcpkgcache.c_str());
+}
+ /*}}}*/
// CacheFile::Close - close the cache files /*{{{*/
// ---------------------------------------------------------------------
/* */
diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index d07337d38..b56e42855 100644
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -17,11 +17,12 @@
#ifndef PKGLIB_CACHEFILE_H
#define PKGLIB_CACHEFILE_H
-
#include <apt-pkg/depcache.h>
-#include <apt-pkg/acquire.h>
-#include <apt-pkg/policy.h>
-#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/macros.h>
+
+class pkgPolicy;
+class pkgSourceList;
+class OpProgress;
class pkgCacheFile
{
@@ -60,6 +61,7 @@ class pkgCacheFile
bool Open(OpProgress *Progress = NULL, bool WithLock = true);
inline bool ReadOnlyOpen(OpProgress *Progress = NULL) { return Open(Progress, false); };
__deprecated bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); };
+ static void RemoveCaches();
void Close();
inline pkgCache* GetPkgCache() { BuildCaches(NULL, false); return Cache; };
diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc
index 8f0725ea3..210a9a9ab 100644
--- a/apt-pkg/cachefilter.cc
+++ b/apt-pkg/cachefilter.cc
@@ -4,6 +4,8 @@
Collection of functor classes */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/cachefilter.h>
#include <apt-pkg/error.h>
#include <apt-pkg/pkgcache.h>
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index b97a1a589..5382f3838 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -32,6 +32,7 @@
#include<iterator>
#include<string.h>
+
// abstract Iterator template /*{{{*/
/* This template provides the very basic iterator methods we
need to have for doing some walk-over-the-cache magic */
@@ -111,7 +112,7 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;};
inline PkgIterator PackageList() const;
- PkgIterator FindPkg(string Arch = "any") const;
+ PkgIterator FindPkg(std::string Arch = "any") const;
/** \brief find the package with the "best" architecture
The best architecture is either the "native" or the first
@@ -219,7 +220,7 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
inline VerFileIterator FileList() const;
bool Downloadable() const;
inline const char *PriorityType() const {return Owner->Priority(S->Priority);};
- string RelStr() const;
+ std::string RelStr() const;
bool Automatic() const;
VerFileIterator NewestFile() const;
@@ -365,7 +366,7 @@ class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator>
inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;};
bool IsOk();
- string RelStr();
+ std::string RelStr();
// Constructors
inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {};
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index a1de613e2..6b95eab70 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -9,18 +9,23 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/cachefile.h>
#include <apt-pkg/cachefilter.h>
#include <apt-pkg/cacheset.h>
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/versionmatch.h>
-
-#include <apti18n.h>
+#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/policy.h>
#include <vector>
#include <regex.h>
+
+#include <apti18n.h>
/*}}}*/
namespace APT {
// FromTask - Return all packages in the cache from a specific task /*{{{*/
@@ -296,7 +301,7 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg,
std::string ver;
bool verIsRel = false;
size_t const vertag = pkg.find_last_of("/=");
- if (vertag != string::npos) {
+ if (vertag != std::string::npos) {
ver = pkg.substr(vertag+1);
verIsRel = (pkg[vertag] == '/');
pkg.erase(vertag);
@@ -314,7 +319,7 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg,
errors = helper.showErrors(false);
for (PackageSet::const_iterator P = pkgset.begin();
P != pkgset.end(); ++P) {
- if (vertag == string::npos) {
+ if (vertag == std::string::npos) {
verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper));
continue;
}
diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h
index 061d0a2f4..3b1118bdc 100644
--- a/apt-pkg/cacheset.h
+++ b/apt-pkg/cacheset.h
@@ -16,9 +16,12 @@
#include <set>
#include <string>
-#include <apt-pkg/cachefile.h>
+#include <apt-pkg/error.h>
#include <apt-pkg/pkgcache.h>
/*}}}*/
+
+class pkgCacheFile;
+
namespace APT {
class PackageSet;
class VersionSet;
@@ -37,10 +40,10 @@ public: /*{{{*/
ShowError(ShowError), ErrorType(ErrorType) {};
virtual ~CacheSetHelper() {};
- virtual void showTaskSelection(PackageSet const &pkgset, string const &pattern) {};
- virtual void showRegExSelection(PackageSet const &pkgset, string const &pattern) {};
+ virtual void showTaskSelection(PackageSet const &pkgset, std::string const &pattern) {};
+ virtual void showRegExSelection(PackageSet const &pkgset, std::string const &pattern) {};
virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver,
- string const &ver, bool const &verIsRel) {};
+ std::string const &ver, bool const &verIsRel) {};
virtual pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str);
virtual PackageSet canNotFindTask(pkgCacheFile &Cache, std::string pattern);
@@ -265,7 +268,7 @@ public: /*{{{*/
inline pkgCache::VerFileIterator FileList() const { return (**this).FileList(); };
inline bool Downloadable() const { return (**this).Downloadable(); };
inline const char *PriorityType() const { return (**this).PriorityType(); };
- inline string RelStr() const { return (**this).RelStr(); };
+ inline std::string RelStr() const { return (**this).RelStr(); };
inline bool Automatic() const { return (**this).Automatic(); };
inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); };
};
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index df1ffedf2..a9c63fd21 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -1,5 +1,6 @@
/*
*/
+#include<config.h>
#include<apt-pkg/init.h>
#include<apt-pkg/error.h>
@@ -7,11 +8,11 @@
#include<apt-pkg/strutl.h>
#include<apt-pkg/cdrom.h>
#include<apt-pkg/aptconfiguration.h>
+#include<apt-pkg/configuration.h>
+#include<apt-pkg/fileutl.h>
#include<sstream>
#include<fstream>
-#include<config.h>
-#include<apti18n.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <dirent.h>
@@ -22,6 +23,8 @@
#include "indexcopy.h"
+#include<apti18n.h>
+
using namespace std;
// FindPackages - Find the package files on the CDROM /*{{{*/
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 614062cbb..319254fd0 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -1,12 +1,11 @@
#ifndef PKGLIB_CDROM_H
#define PKGLIB_CDROM_H
-#include<apt-pkg/init.h>
#include<string>
#include<vector>
-
-using namespace std;
+class Configuration;
+class OpProgress;
class pkgCdromStatus /*{{{*/
{
@@ -20,12 +19,12 @@ class pkgCdromStatus /*{{{*/
// total steps
virtual void SetTotal(int total) { totalSteps = total; };
// update steps, will be called regularly as a "pulse"
- virtual void Update(string text="", int current=0) = 0;
+ virtual void Update(std::string text="", int current=0) = 0;
// ask for cdrom insert
virtual bool ChangeCdrom() = 0;
// ask for cdrom name
- virtual bool AskCdromName(string &Name) = 0;
+ virtual bool AskCdromName(std::string &Name) = 0;
// Progress indicator for the Index rewriter
virtual OpProgress* GetOpProgress() {return NULL; };
};
@@ -47,22 +46,22 @@ class pkgCdrom /*{{{*/
};
- bool FindPackages(string CD,
- vector<string> &List,
- vector<string> &SList,
- vector<string> &SigList,
- vector<string> &TransList,
- string &InfoDir, pkgCdromStatus *log,
+ bool FindPackages(std::string CD,
+ std::vector<std::string> &List,
+ std::vector<std::string> &SList,
+ std::vector<std::string> &SigList,
+ std::vector<std::string> &TransList,
+ std::string &InfoDir, pkgCdromStatus *log,
unsigned int Depth = 0);
- bool DropBinaryArch(vector<string> &List);
- bool DropRepeats(vector<string> &List,const char *Name);
- void ReduceSourcelist(string CD,vector<string> &List);
+ bool DropBinaryArch(std::vector<std::string> &List);
+ bool DropRepeats(std::vector<std::string> &List,const char *Name);
+ void ReduceSourcelist(std::string CD,std::vector<std::string> &List);
bool WriteDatabase(Configuration &Cnf);
- bool WriteSourceList(string Name,vector<string> &List,bool Source);
- int Score(string Path);
+ bool WriteSourceList(std::string Name,std::vector<std::string> &List,bool Source);
+ int Score(std::string Path);
public:
- bool Ident(string &ident, pkgCdromStatus *log);
+ bool Ident(std::string &ident, pkgCdromStatus *log);
bool Add(pkgCdromStatus *log);
};
/*}}}*/
@@ -71,9 +70,9 @@ class pkgCdrom /*{{{*/
// class that uses libudev to find cdrom/removable devices dynamically
struct CdromDevice /*{{{*/
{
- string DeviceName;
+ std::string DeviceName;
bool Mounted;
- string MountPath;
+ std::string MountPath;
};
/*}}}*/
class pkgUdevCdromDevices /*{{{*/
@@ -104,9 +103,9 @@ class pkgUdevCdromDevices /*{{{*/
// convenience interface, this will just call ScanForRemovable
// with "APT::cdrom::CdromOnly"
- vector<CdromDevice> Scan();
+ std::vector<CdromDevice> Scan();
- vector<CdromDevice> ScanForRemovable(bool CdromOnly);
+ std::vector<CdromDevice> ScanForRemovable(bool CdromOnly);
};
/*}}}*/
diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index 9850b93b4..ed8fa1aa9 100644
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -8,23 +8,26 @@
##################################################################### */
/*}}}*/
// Includes /*{{{*/
+#include<config.h>
+
#include <apt-pkg/clean.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/aptconfiguration.h>
-
-#include <apti18n.h>
+#include <apt-pkg/fileutl.h>
#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>
+
+#include <apti18n.h>
/*}}}*/
// ArchiveCleaner::Go - Perform smart cleanup of the archive /*{{{*/
// ---------------------------------------------------------------------
/* Scan the directory for files to erase, we check the version information
against our database to see if it is interesting */
-bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
+bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
{
bool CleanInstalled = _config->FindB("APT::Clean-Installed",true);
@@ -32,7 +35,7 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
if (D == 0)
return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
- string StartDir = SafeGetCWD();
+ std::string StartDir = SafeGetCWD();
if (chdir(Dir.c_str()) != 0)
{
closedir(D);
@@ -61,21 +64,21 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
for (; *I != 0 && *I != '_';I++);
if (*I != '_')
continue;
- string Pkg = DeQuoteString(string(Dir->d_name,I-Dir->d_name));
+ std::string Pkg = DeQuoteString(std::string(Dir->d_name,I-Dir->d_name));
// Grab the version
const char *Start = I + 1;
for (I = Start; *I != 0 && *I != '_';I++);
if (*I != '_')
continue;
- string Ver = DeQuoteString(string(Start,I-Start));
+ std::string Ver = DeQuoteString(std::string(Start,I-Start));
// Grab the arch
Start = I + 1;
for (I = Start; *I != 0 && *I != '.' ;I++);
if (*I != '.')
continue;
- string const Arch = DeQuoteString(string(Start,I-Start));
+ std::string const Arch = DeQuoteString(std::string(Start,I-Start));
if (APT::Configuration::checkArchitecture(Arch) == false)
continue;
diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h
index 1ebf68dc9..ad4049e83 100644
--- a/apt-pkg/clean.h
+++ b/apt-pkg/clean.h
@@ -20,11 +20,11 @@ class pkgArchiveCleaner
protected:
- virtual void Erase(const char * /*File*/,string /*Pkg*/,string /*Ver*/,struct stat & /*St*/) {};
+ virtual void Erase(const char * /*File*/,std::string /*Pkg*/,std::string /*Ver*/,struct stat & /*St*/) {};
public:
- bool Go(string Dir,pkgCache &Cache);
+ bool Go(std::string Dir,pkgCache &Cache);
virtual ~pkgArchiveCleaner() {};
};
diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index e25caf1a5..187f6bd59 100644
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -10,6 +10,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/cdromutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/md5.h>
@@ -17,8 +19,6 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/strutl.h>
-#include <apti18n.h>
-
#include <sys/wait.h>
#include <sys/statvfs.h>
#include <dirent.h>
@@ -26,8 +26,12 @@
#include <sys/stat.h>
#include <unistd.h>
#include <stdio.h>
+
+#include <apti18n.h>
/*}}}*/
+using std::string;
+
// IsMounted - Returns true if the mount point is mounted /*{{{*/
// ---------------------------------------------------------------------
/* This is a simple algorithm that should always work, we stat the mount point
diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h
index 38ed2996e..2c6afac0f 100644
--- a/apt-pkg/contrib/cdromutl.h
+++ b/apt-pkg/contrib/cdromutl.h
@@ -12,13 +12,11 @@
#include <string>
-using std::string;
-
// mount cdrom, DeviceName (e.g. /dev/sr0) is optional
-bool MountCdrom(string Path, string DeviceName="");
-bool UnmountCdrom(string Path);
-bool IdentCdrom(string CD,string &Res,unsigned int Version = 2);
-bool IsMounted(string &Path);
-string FindMountPointForDevice(const char *device);
+bool MountCdrom(std::string Path, std::string DeviceName="");
+bool UnmountCdrom(std::string Path);
+bool IdentCdrom(std::string CD,std::string &Res,unsigned int Version = 2);
+bool IsMounted(std::string &Path);
+std::string FindMountPointForDevice(const char *device);
#endif
diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index 5a9944096..159f330a1 100644
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -11,11 +11,14 @@
##################################################################### */
/*}}}*/
// Include files /*{{{*/
+#include<config.h>
+
+#include <apt-pkg/configuration.h>
#include <apt-pkg/cmndline.h>
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
-#include <apti18n.h>
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -87,9 +90,8 @@ bool CommandLine::Parse(int argc,const char **argv)
Opt++;
// Match up to a = against the list
- const char *OptEnd = Opt;
Args *A;
- for (; *OptEnd != 0 && *OptEnd != '='; OptEnd++);
+ const char *OptEnd = strchrnul(Opt, '=');
for (A = ArgList; A->end() == false &&
stringcasecmp(Opt,OptEnd,A->LongOpt) != 0; A++);
@@ -97,9 +99,8 @@ bool CommandLine::Parse(int argc,const char **argv)
bool PreceedMatch = false;
if (A->end() == true)
{
- for (; Opt != OptEnd && *Opt != '-'; Opt++);
-
- if (Opt == OptEnd)
+ Opt = (const char*) memchr(Opt, '-', OptEnd - Opt);
+ if (Opt == NULL)
return _error->Error(_("Command line option %s is not understood"),argv[I]);
Opt++;
@@ -194,9 +195,8 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
// Arbitrary item specification
if ((A->Flags & ArbItem) == ArbItem)
{
- const char *J;
- for (J = Argument; *J != 0 && *J != '='; J++);
- if (*J == 0)
+ const char *J = strchr(Argument, '=');
+ if (J == NULL)
return _error->Error(_("Option %s: Configuration item specification must have an =<val>."),argv[I]);
// = is trailing
@@ -212,8 +212,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
return true;
}
- const char *I = A->ConfName;
- for (; *I != 0 && *I != ' '; I++);
+ const char *I = strchrnul(A->ConfName, ' ');
if (*I == ' ')
Conf->Set(string(A->ConfName,0,I-A->ConfName),string(I+1) + Argument);
else
@@ -269,10 +268,9 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
// Skip the leading dash
const char *J = argv[I];
for (; *J != 0 && *J == '-'; J++);
-
- const char *JEnd = J;
- for (; *JEnd != 0 && *JEnd != '-'; JEnd++);
- if (*JEnd != 0)
+
+ const char *JEnd = strchr(J, '-');
+ if (JEnd != NULL)
{
strncpy(Buffer,J,JEnd - J);
Buffer[JEnd - J] = 0;
@@ -373,9 +371,8 @@ void CommandLine::SaveInConfig(unsigned int const &argc, char const * const * co
{
// That is possibly an option: Quote it if it includes spaces,
// the benefit is that this will eliminate also most false positives
- const char* c = &argv[i][j+1];
- for (; *c != '\0' && *c != ' '; ++c);
- if (*c == '\0') continue;
+ const char* c = strchr(&argv[i][j+1], ' ');
+ if (c == NULL) continue;
cmdline[++length] = '"';
closeQuote = true;
}
diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index 7c0c71aa7..b201d9855 100644
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -44,9 +44,7 @@
#ifndef PKGLIB_CMNDLINE_H
#define PKGLIB_CMNDLINE_H
-
-
-#include <apt-pkg/configuration.h>
+class Configuration;
class CommandLine
{
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 2db191ba2..0949ec223 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -15,16 +15,19 @@
##################################################################### */
/*}}}*/
// Include files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
-#include <apti18n.h>
#include <vector>
#include <fstream>
#include <iostream>
+#include <apti18n.h>
+
using namespace std;
/*}}}*/
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 2844ec097..f6f2a3c1d 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -34,21 +34,19 @@
#include <vector>
#include <iostream>
-using std::string;
-
class Configuration
{
public:
struct Item
{
- string Value;
- string Tag;
+ std::string Value;
+ std::string Tag;
Item *Parent;
Item *Child;
Item *Next;
- string FullTag(const Item *Stop = 0) const;
+ std::string FullTag(const Item *Stop = 0) const;
Item() : Parent(0), Child(0), Next(0) {};
};
@@ -67,35 +65,35 @@ class Configuration
public:
- string Find(const char *Name,const char *Default = 0) const;
- string Find(string const &Name,const char *Default = 0) const {return Find(Name.c_str(),Default);};
- string Find(string const &Name, string const &Default) const {return Find(Name.c_str(),Default.c_str());};
- string FindFile(const char *Name,const char *Default = 0) const;
- string FindDir(const char *Name,const char *Default = 0) const;
- std::vector<string> FindVector(const char *Name) const;
- std::vector<string> FindVector(string const &Name) const { return FindVector(Name.c_str()); };
+ std::string Find(const char *Name,const char *Default = 0) const;
+ std::string Find(std::string const &Name,const char *Default = 0) const {return Find(Name.c_str(),Default);};
+ std::string Find(std::string const &Name, std::string const &Default) const {return Find(Name.c_str(),Default.c_str());};
+ std::string FindFile(const char *Name,const char *Default = 0) const;
+ std::string FindDir(const char *Name,const char *Default = 0) const;
+ std::vector<std::string> FindVector(const char *Name) const;
+ std::vector<std::string> FindVector(std::string const &Name) const { return FindVector(Name.c_str()); };
int FindI(const char *Name,int const &Default = 0) const;
- int FindI(string const &Name,int const &Default = 0) const {return FindI(Name.c_str(),Default);};
+ int FindI(std::string const &Name,int const &Default = 0) const {return FindI(Name.c_str(),Default);};
bool FindB(const char *Name,bool const &Default = false) const;
- bool FindB(string const &Name,bool const &Default = false) const {return FindB(Name.c_str(),Default);};
- string FindAny(const char *Name,const char *Default = 0) const;
+ bool FindB(std::string const &Name,bool const &Default = false) const {return FindB(Name.c_str(),Default);};
+ std::string FindAny(const char *Name,const char *Default = 0) const;
- inline void Set(const string &Name,const string &Value) {Set(Name.c_str(),Value);};
- void CndSet(const char *Name,const string &Value);
+ inline void Set(const std::string &Name,const std::string &Value) {Set(Name.c_str(),Value);};
+ void CndSet(const char *Name,const std::string &Value);
void CndSet(const char *Name,const int Value);
- void Set(const char *Name,const string &Value);
+ void Set(const char *Name,const std::string &Value);
void Set(const char *Name,const int &Value);
- inline bool Exists(const string &Name) const {return Exists(Name.c_str());};
+ inline bool Exists(const std::string &Name) const {return Exists(Name.c_str());};
bool Exists(const char *Name) const;
bool ExistsAny(const char *Name) const;
// clear a whole tree
- void Clear(const string &Name);
+ void Clear(const std::string &Name);
// remove a certain value from a list (e.g. the list of "APT::Keep-Fds")
- void Clear(string const &List, string const &Value);
- void Clear(string const &List, int const &Value);
+ void Clear(std::string const &List, std::string const &Value);
+ void Clear(std::string const &List, int const &Value);
inline const Item *Tree(const char *Name) const {return Lookup(Name);};
@@ -127,11 +125,11 @@ class Configuration
extern Configuration *_config;
-bool ReadConfigFile(Configuration &Conf,const string &FName,
+bool ReadConfigFile(Configuration &Conf,const std::string &FName,
bool const &AsSectional = false,
unsigned const &Depth = 0);
-bool ReadConfigDir(Configuration &Conf,const string &Dir,
+bool ReadConfigDir(Configuration &Conf,const std::string &Dir,
bool const &AsSectional = false,
unsigned const &Depth = 0);
diff --git a/apt-pkg/contrib/crc-16.cc b/apt-pkg/contrib/crc-16.cc
index b300ed67e..4058821f9 100644
--- a/apt-pkg/contrib/crc-16.cc
+++ b/apt-pkg/contrib/crc-16.cc
@@ -15,6 +15,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/crc-16.h>
/*}}}*/
@@ -63,7 +65,7 @@ static unsigned short const crc16_table[256] =
/* Recompute the FCS with one more character appended. */
#define CalcFCS(fcs, c) (((fcs) >> 8) ^ crc16_table[((fcs) ^ (c)) & 0xff])
unsigned short AddCRC16(unsigned short fcs, void const *Buf,
- unsigned long len)
+ unsigned long long len)
{
unsigned char const *buf = (unsigned char const *)Buf;
while (len--)
diff --git a/apt-pkg/contrib/crc-16.h b/apt-pkg/contrib/crc-16.h
index f30678bac..702de40b2 100644
--- a/apt-pkg/contrib/crc-16.h
+++ b/apt-pkg/contrib/crc-16.h
@@ -12,6 +12,6 @@
#define INIT_FCS 0xffff
unsigned short AddCRC16(unsigned short fcs, void const *buf,
- unsigned long len);
+ unsigned long long len);
#endif
diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index edb290f34..122e2c809 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -13,6 +13,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/error.h>
#include <iostream>
@@ -24,8 +26,7 @@
#include <string>
#include <cstring>
-#include "config.h"
- /*}}}*/
+ /*}}}*/
// Global Error Object /*{{{*/
/* If the implementation supports posix threads then the accessor function
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 85dc6f600..95058cbde 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -18,14 +18,14 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/fileutl.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/sptr.h>
#include <apt-pkg/configuration.h>
-#include <apti18n.h>
-
#include <cstdlib>
#include <cstring>
#include <cstdio>
@@ -43,10 +43,11 @@
#include <set>
#include <algorithm>
-#include <config.h>
#ifdef WORDS_BIGENDIAN
#include <inttypes.h>
#endif
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -132,10 +133,10 @@ bool CopyFile(FileFd &From,FileFd &To)
// Buffered copy between fds
SPtrArray<unsigned char> Buf = new unsigned char[64000];
- unsigned long Size = From.Size();
+ unsigned long long Size = From.Size();
while (Size != 0)
{
- unsigned long ToRead = Size;
+ unsigned long long ToRead = Size;
if (Size > 64000)
ToRead = 64000;
@@ -810,7 +811,7 @@ FileFd::~FileFd()
// ---------------------------------------------------------------------
/* We are carefull to handle interruption by a signal while reading
gracefully. */
-bool FileFd::Read(void *To,unsigned long Size,unsigned long *Actual)
+bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
{
int Res;
errno = 0;
@@ -849,13 +850,13 @@ bool FileFd::Read(void *To,unsigned long Size,unsigned long *Actual)
}
Flags |= Fail;
- return _error->Error(_("read, still have %lu to read but none left"),Size);
+ return _error->Error(_("read, still have %llu to read but none left"), Size);
}
/*}}}*/
// FileFd::Write - Write to the file /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool FileFd::Write(const void *From,unsigned long Size)
+bool FileFd::Write(const void *From,unsigned long long Size)
{
int Res;
errno = 0;
@@ -882,13 +883,13 @@ bool FileFd::Write(const void *From,unsigned long Size)
return true;
Flags |= Fail;
- return _error->Error(_("write, still have %lu to write but couldn't"),Size);
+ return _error->Error(_("write, still have %llu to write but couldn't"), Size);
}
/*}}}*/
// FileFd::Seek - Seek in the file /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool FileFd::Seek(unsigned long To)
+bool FileFd::Seek(unsigned long long To)
{
int res;
if (gz)
@@ -898,7 +899,7 @@ bool FileFd::Seek(unsigned long To)
if (res != (signed)To)
{
Flags |= Fail;
- return _error->Error("Unable to seek to %lu",To);
+ return _error->Error("Unable to seek to %llu", To);
}
return true;
@@ -907,7 +908,7 @@ bool FileFd::Seek(unsigned long To)
// FileFd::Skip - Seek in the file /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool FileFd::Skip(unsigned long Over)
+bool FileFd::Skip(unsigned long long Over)
{
int res;
if (gz)
@@ -917,7 +918,7 @@ bool FileFd::Skip(unsigned long Over)
if (res < 0)
{
Flags |= Fail;
- return _error->Error("Unable to seek ahead %lu",Over);
+ return _error->Error("Unable to seek ahead %llu",Over);
}
return true;
@@ -926,7 +927,7 @@ bool FileFd::Skip(unsigned long Over)
// FileFd::Truncate - Truncate the file /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool FileFd::Truncate(unsigned long To)
+bool FileFd::Truncate(unsigned long long To)
{
if (gz)
{
@@ -936,7 +937,7 @@ bool FileFd::Truncate(unsigned long To)
if (ftruncate(iFd,To) != 0)
{
Flags |= Fail;
- return _error->Error("Unable to truncate to %lu",To);
+ return _error->Error("Unable to truncate to %llu",To);
}
return true;
@@ -945,7 +946,7 @@ bool FileFd::Truncate(unsigned long To)
// FileFd::Tell - Current seek position /*{{{*/
// ---------------------------------------------------------------------
/* */
-unsigned long FileFd::Tell()
+unsigned long long FileFd::Tell()
{
off_t Res;
if (gz)
@@ -960,7 +961,7 @@ unsigned long FileFd::Tell()
// FileFd::FileSize - Return the size of the file /*{{{*/
// ---------------------------------------------------------------------
/* */
-unsigned long FileFd::FileSize()
+unsigned long long FileFd::FileSize()
{
struct stat Buf;
@@ -972,9 +973,9 @@ unsigned long FileFd::FileSize()
// FileFd::Size - Return the size of the content in the file /*{{{*/
// ---------------------------------------------------------------------
/* */
-unsigned long FileFd::Size()
+unsigned long long FileFd::Size()
{
- unsigned long size = FileSize();
+ unsigned long long size = FileSize();
// only check gzsize if we are actually a gzip file, just checking for
// "gz" is not sufficient as uncompressed files will be opened with
@@ -984,6 +985,7 @@ unsigned long FileFd::Size()
/* unfortunately zlib.h doesn't provide a gzsize(), so we have to do
* this ourselves; the original (uncompressed) file size is the last 32
* bits of the file */
+ // FIXME: Size for gz-files is limited by 32bit… no largefile support
off_t orig_pos = lseek(iFd, 0, SEEK_CUR);
if (lseek(iFd, -4, SEEK_END) < 0)
return _error->Errno("lseek","Unable to seek to end of gzipped file");
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index a1b177f38..0d0451a46 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -31,8 +31,6 @@
/* Define this for python-apt */
#define APT_HAS_GZIP 1
-using std::string;
-
class FileFd
{
protected:
@@ -41,30 +39,45 @@ class FileFd
enum LocalFlags {AutoClose = (1<<0),Fail = (1<<1),DelOnFail = (1<<2),
HitEof = (1<<3), Replace = (1<<4) };
unsigned long Flags;
- string FileName;
- string TemporaryFileName;
+ std::string FileName;
+ std::string TemporaryFileName;
gzFile gz;
public:
enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp,ReadOnlyGzip,
WriteAtomic};
- inline bool Read(void *To,unsigned long Size,bool AllowEof)
+ inline bool Read(void *To,unsigned long long Size,bool AllowEof)
{
- unsigned long Jnk;
+ unsigned long long Jnk;
if (AllowEof)
return Read(To,Size,&Jnk);
return Read(To,Size);
}
- bool Read(void *To,unsigned long Size,unsigned long *Actual = 0);
- bool Write(const void *From,unsigned long Size);
- bool Seek(unsigned long To);
- bool Skip(unsigned long To);
- bool Truncate(unsigned long To);
- unsigned long Tell();
- unsigned long Size();
- unsigned long FileSize();
- bool Open(string FileName,OpenMode Mode,unsigned long Perms = 0666);
+ bool Read(void *To,unsigned long long Size,unsigned long long *Actual = 0);
+ bool Write(const void *From,unsigned long long Size);
+ bool Seek(unsigned long long To);
+ bool Skip(unsigned long long To);
+ bool Truncate(unsigned long long To);
+ unsigned long long Tell();
+ unsigned long long Size();
+ unsigned long long FileSize();
+
+ /* You want to use 'unsigned long long' if you are talking about a file
+ to be able to support large files (>2 or >4 GB) properly.
+ This shouldn't happen all to often for the indexes, but deb's might be…
+ And as the auto-conversation converts a 'unsigned long *' to a 'bool'
+ instead of 'unsigned long long *' we need to provide this explicitely -
+ otherwise applications magically start to fail… */
+ __deprecated bool Read(void *To,unsigned long long Size,unsigned long *Actual)
+ {
+ unsigned long long R;
+ bool const T = Read(To, Size, &R);
+ *Actual = R;
+ return T;
+ }
+
+ bool Open(std::string FileName,OpenMode Mode,unsigned long Perms = 0666);
bool OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose=false);
bool Close();
bool Sync();
@@ -78,9 +91,9 @@ class FileFd
inline void EraseOnFailure() {Flags |= DelOnFail;};
inline void OpFail() {Flags |= Fail;};
inline bool Eof() {return (Flags & HitEof) == HitEof;};
- inline string &Name() {return FileName;};
+ inline std::string &Name() {return FileName;};
- FileFd(string FileName,OpenMode Mode,unsigned long Perms = 0666) : iFd(-1),
+ FileFd(std::string FileName,OpenMode Mode,unsigned long Perms = 0666) : iFd(-1),
Flags(0), gz(NULL)
{
Open(FileName,Mode,Perms);
@@ -92,12 +105,12 @@ class FileFd
bool RunScripts(const char *Cnf);
bool CopyFile(FileFd &From,FileFd &To);
-int GetLock(string File,bool Errors = true);
-bool FileExists(string File);
-bool RealFileExists(string File);
-bool DirectoryExists(string const &Path) __attrib_const;
-bool CreateDirectory(string const &Parent, string const &Path);
-time_t GetModificationTime(string const &Path);
+int GetLock(std::string File,bool Errors = true);
+bool FileExists(std::string File);
+bool RealFileExists(std::string File);
+bool DirectoryExists(std::string const &Path) __attrib_const;
+bool CreateDirectory(std::string const &Parent, std::string const &Path);
+time_t GetModificationTime(std::string const &Path);
/** \brief Ensure the existence of the given Path
*
@@ -105,13 +118,13 @@ time_t GetModificationTime(string const &Path);
* /apt/ will be removed before CreateDirectory call.
* \param Path which should exist after (successful) call
*/
-bool CreateAPTDirectoryIfNeeded(string const &Parent, string const &Path);
+bool CreateAPTDirectoryIfNeeded(std::string const &Parent, std::string const &Path);
-std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
+std::vector<std::string> GetListOfFilesInDir(std::string const &Dir, std::string const &Ext,
bool const &SortList, bool const &AllowNoExt=false);
-std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext,
+std::vector<std::string> GetListOfFilesInDir(std::string const &Dir, std::vector<std::string> const &Ext,
bool const &SortList);
-string SafeGetCWD();
+std::string SafeGetCWD();
void SetCloseExec(int Fd,bool Close);
void SetNonBlock(int Fd,bool Block);
bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0);
@@ -119,10 +132,10 @@ pid_t ExecFork();
bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
// File string manipulators
-string flNotDir(string File);
-string flNotFile(string File);
-string flNoLink(string File);
-string flExtension(string File);
-string flCombine(string Dir,string File);
+std::string flNotDir(std::string File);
+std::string flNotFile(std::string File);
+std::string flNoLink(std::string File);
+std::string flExtension(std::string File);
+std::string flCombine(std::string Dir,std::string File);
#endif
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index 4407574fa..05001f042 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -11,12 +11,14 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/hashes.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/macros.h>
-#include <unistd.h>
+#include <unistd.h>
#include <string>
#include <iostream>
/*}}}*/
@@ -30,20 +32,20 @@ HashString::HashString()
{
}
-HashString::HashString(string Type, string Hash) : Type(Type), Hash(Hash)
+HashString::HashString(std::string Type, std::string Hash) : Type(Type), Hash(Hash)
{
}
-HashString::HashString(string StringedHash) /*{{{*/
+HashString::HashString(std::string StringedHash) /*{{{*/
{
// legacy: md5sum without "MD5Sum:" prefix
- if (StringedHash.find(":") == string::npos && StringedHash.size() == 32)
+ if (StringedHash.find(":") == std::string::npos && StringedHash.size() == 32)
{
Type = "MD5Sum";
Hash = StringedHash;
return;
}
- string::size_type pos = StringedHash.find(":");
+ std::string::size_type pos = StringedHash.find(":");
Type = StringedHash.substr(0,pos);
Hash = StringedHash.substr(pos+1, StringedHash.size() - pos);
@@ -51,34 +53,34 @@ HashString::HashString(string StringedHash) /*{{{*/
std::clog << "HashString(string): " << Type << " : " << Hash << std::endl;
}
/*}}}*/
-bool HashString::VerifyFile(string filename) const /*{{{*/
+bool HashString::VerifyFile(std::string filename) const /*{{{*/
{
- string fileHash;
+ std::string fileHash;
FileFd Fd(filename, FileFd::ReadOnly);
if(Type == "MD5Sum")
{
MD5Summation MD5;
MD5.AddFD(Fd.Fd(), Fd.Size());
- fileHash = (string)MD5.Result();
+ fileHash = (std::string)MD5.Result();
}
else if (Type == "SHA1")
{
SHA1Summation SHA1;
SHA1.AddFD(Fd.Fd(), Fd.Size());
- fileHash = (string)SHA1.Result();
+ fileHash = (std::string)SHA1.Result();
}
else if (Type == "SHA256")
{
SHA256Summation SHA256;
SHA256.AddFD(Fd.Fd(), Fd.Size());
- fileHash = (string)SHA256.Result();
+ fileHash = (std::string)SHA256.Result();
}
else if (Type == "SHA512")
{
SHA512Summation SHA512;
SHA512.AddFD(Fd.Fd(), Fd.Size());
- fileHash = (string)SHA512.Result();
+ fileHash = (std::string)SHA512.Result();
}
Fd.Close();
@@ -98,26 +100,26 @@ bool HashString::empty() const
return (Type.empty() || Hash.empty());
}
-string HashString::toStr() const
+std::string HashString::toStr() const
{
- return Type+string(":")+Hash;
+ return Type + std::string(":") + Hash;
}
// Hashes::AddFD - Add the contents of the FD /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool Hashes::AddFD(int const Fd,unsigned long Size, bool const addMD5,
+bool Hashes::AddFD(int const Fd,unsigned long long Size, bool const addMD5,
bool const addSHA1, bool const addSHA256, bool const addSHA512)
{
unsigned char Buf[64*64];
- int Res = 0;
+ ssize_t Res = 0;
int ToEOF = (Size == 0);
while (Size != 0 || ToEOF)
{
- unsigned n = sizeof(Buf);
- if (!ToEOF) n = min(Size,(unsigned long)n);
+ unsigned long long n = sizeof(Buf);
+ if (!ToEOF) n = std::min(Size, n);
Res = read(Fd,Buf,n);
- if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
+ if (Res < 0 || (!ToEOF && Res != (ssize_t) n)) // error, or short read
return false;
if (ToEOF && Res == 0) // EOF
break;
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index e702fcca2..81851dede 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -22,31 +22,28 @@
#include <vector>
#include <cstring>
-using std::min;
-using std::vector;
-
// helper class that contains hash function name
// and hash
class HashString
{
protected:
- string Type;
- string Hash;
+ std::string Type;
+ std::string Hash;
static const char * _SupportedHashes[10];
public:
- HashString(string Type, string Hash);
- HashString(string StringedHashString); // init from str as "type:hash"
+ HashString(std::string Type, std::string Hash);
+ HashString(std::string StringedHashString); // init from str as "type:hash"
HashString();
// get hash type used
- string HashType() { return Type; };
+ std::string HashType() { return Type; };
// verify the given filename against the currently loaded hash
- bool VerifyFile(string filename) const;
+ bool VerifyFile(std::string filename) const;
// helper
- string toStr() const; // convert to str as "type:hash"
+ std::string toStr() const; // convert to str as "type:hash"
bool empty() const;
// return the list of hashes we support
@@ -62,14 +59,14 @@ class Hashes
SHA256Summation SHA256;
SHA512Summation SHA512;
- inline bool Add(const unsigned char *Data,unsigned long Size)
+ inline bool Add(const unsigned char *Data,unsigned long long Size)
{
return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size) && SHA512.Add(Data,Size);
};
inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));};
- inline bool AddFD(int const Fd,unsigned long Size = 0)
+ inline bool AddFD(int const Fd,unsigned long long Size = 0)
{ return AddFD(Fd, Size, true, true, true, true); };
- bool AddFD(int const Fd, unsigned long Size, bool const addMD5,
+ bool AddFD(int const Fd, unsigned long long Size, bool const addMD5,
bool const addSHA1, bool const addSHA256, bool const addSHA512);
inline bool Add(const unsigned char *Beg,const unsigned char *End)
{return Add(Beg,End-Beg);};
diff --git a/apt-pkg/contrib/hashsum.cc b/apt-pkg/contrib/hashsum.cc
index 728747d7a..ff3b112bb 100644
--- a/apt-pkg/contrib/hashsum.cc
+++ b/apt-pkg/contrib/hashsum.cc
@@ -1,4 +1,5 @@
// Cryptographic API Base
+#include <config.h>
#include <unistd.h>
#include "hashsum_template.h"
@@ -6,16 +7,16 @@
// Summation::AddFD - Add content of file into the checksum /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool SummationImplementation::AddFD(int const Fd, unsigned long Size) {
+bool SummationImplementation::AddFD(int const Fd, unsigned long long Size) {
unsigned char Buf[64 * 64];
- int Res = 0;
+ ssize_t Res = 0;
int ToEOF = (Size == 0);
while (Size != 0 || ToEOF)
{
- unsigned n = sizeof(Buf);
- if (!ToEOF) n = min(Size,(unsigned long)n);
+ unsigned long long n = sizeof(Buf);
+ if (!ToEOF) n = std::min(Size, n);
Res = read(Fd, Buf, n);
- if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
+ if (Res < 0 || (!ToEOF && Res != (ssize_t) n)) // error, or short read
return false;
if (ToEOF && Res == 0) // EOF
break;
diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h
index fe0984f4e..27d192b82 100644
--- a/apt-pkg/contrib/hashsum_template.h
+++ b/apt-pkg/contrib/hashsum_template.h
@@ -15,9 +15,6 @@
#include <algorithm>
#include <stdint.h>
-using std::string;
-using std::min;
-
template<int N>
class HashSumValue
{
@@ -35,7 +32,7 @@ class HashSumValue
return memcmp(Sum,rhs.Sum,sizeof(Sum)) != 0;
};
- string Value() const
+ std::string Value() const
{
char Conv[16] =
{ '0','1','2','3','4','5','6','7','8','9','a','b',
@@ -52,7 +49,7 @@ class HashSumValue
Result[I] = Conv[Sum[J] >> 4];
Result[I + 1] = Conv[Sum[J] & 0xF];
}
- return string(Result);
+ return std::string(Result);
};
inline void Value(unsigned char S[N/8])
@@ -61,12 +58,12 @@ class HashSumValue
S[I] = Sum[I];
};
- inline operator string() const
+ inline operator std::string() const
{
return Value();
};
- bool Set(string Str)
+ bool Set(std::string Str)
{
return Hex2Num(Str,Sum,sizeof(Sum));
};
@@ -77,7 +74,7 @@ class HashSumValue
Sum[I] = S[I];
};
- HashSumValue(string Str)
+ HashSumValue(std::string Str)
{
memset(Sum,0,sizeof(Sum));
Set(Str);
@@ -91,8 +88,8 @@ class HashSumValue
class SummationImplementation
{
public:
- virtual bool Add(const unsigned char *inbuf, unsigned long inlen) = 0;
- inline bool Add(const char *inbuf, unsigned long const inlen)
+ virtual bool Add(const unsigned char *inbuf, unsigned long long inlen) = 0;
+ inline bool Add(const char *inbuf, unsigned long long const inlen)
{ return Add((unsigned char *)inbuf, inlen); };
inline bool Add(const unsigned char *Data)
@@ -105,7 +102,7 @@ class SummationImplementation
inline bool Add(const char *Beg, const char *End)
{ return Add((const unsigned char *)Beg, End - Beg); };
- bool AddFD(int Fd, unsigned long Size = 0);
+ bool AddFD(int Fd, unsigned long long Size = 0);
};
#endif
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 65e20e9bb..4351aeb22 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -35,6 +35,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/md5.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/macros.h>
@@ -43,7 +45,6 @@
#include <unistd.h>
#include <netinet/in.h> // For htonl
#include <inttypes.h>
-#include <config.h>
/*}}}*/
// byteSwap - Swap bytes in a buffer /*{{{*/
@@ -186,7 +187,7 @@ MD5Summation::MD5Summation()
// MD5Summation::Add - 'Add' a data set to the hash /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool MD5Summation::Add(const unsigned char *data,unsigned long len)
+bool MD5Summation::Add(const unsigned char *data,unsigned long long len)
{
if (Done == true)
return false;
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index e76428325..a207da4e4 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -29,9 +29,6 @@
#include <algorithm>
#include <stdint.h>
-using std::string;
-using std::min;
-
#include "hashsum_template.h"
typedef HashSumValue<128> MD5SumValue;
@@ -45,7 +42,7 @@ class MD5Summation : public SummationImplementation
public:
- bool Add(const unsigned char *inbuf, unsigned long inlen);
+ bool Add(const unsigned char *inbuf, unsigned long long inlen);
using SummationImplementation::Add;
MD5SumValue Result();
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 19381ae47..f76169a92 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -17,10 +17,11 @@
/*}}}*/
// Include Files /*{{{*/
#define _BSD_SOURCE
+#include <config.h>
+
#include <apt-pkg/mmap.h>
#include <apt-pkg/error.h>
-
-#include <apti18n.h>
+#include <apt-pkg/fileutl.h>
#include <sys/mman.h>
#include <sys/stat.h>
@@ -28,9 +29,10 @@
#include <fcntl.h>
#include <stdlib.h>
#include <errno.h>
-
#include <cstring>
- /*}}}*/
+
+#include <apti18n.h>
+ /*}}}*/
// MMap::MMap - Constructor /*{{{*/
// ---------------------------------------------------------------------
@@ -94,7 +96,7 @@ bool MMap::Map(FileFd &Fd)
return false;
}
else
- return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"),
+ return _error->Errno("mmap",_("Couldn't make mmap of %llu bytes"),
iSize);
}
@@ -165,7 +167,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
return true;
#ifdef _POSIX_SYNCHRONIZED_IO
- unsigned long PSize = sysconf(_SC_PAGESIZE);
+ unsigned long long PSize = sysconf(_SC_PAGESIZE);
if ((Flags & ReadOnly) != ReadOnly)
{
if (SyncToFd != 0)
@@ -176,7 +178,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
}
else
{
- if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)
+ if (msync((char *)Base+(unsigned long long)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)
return _error->Errno("msync", _("Unable to synchronize mmap"));
}
}
@@ -196,7 +198,7 @@ DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long const &Work
if (_error->PendingError() == true)
return;
- unsigned long EndOfFile = Fd->Size();
+ unsigned long long EndOfFile = Fd->Size();
if (EndOfFile > WorkSpace)
WorkSpace = EndOfFile;
else if(WorkSpace > 0)
@@ -284,7 +286,7 @@ DynamicMMap::~DynamicMMap()
return;
}
- unsigned long EndOfFile = iSize;
+ unsigned long long EndOfFile = iSize;
iSize = WorkSpace;
Close(false);
if(ftruncate(Fd->Fd(),EndOfFile) < 0)
@@ -294,9 +296,9 @@ DynamicMMap::~DynamicMMap()
// DynamicMMap::RawAllocate - Allocate a raw chunk of unaligned space /*{{{*/
// ---------------------------------------------------------------------
/* This allocates a block of memory aligned to the given size */
-unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
+unsigned long DynamicMMap::RawAllocate(unsigned long long Size,unsigned long Aln)
{
- unsigned long Result = iSize;
+ unsigned long long Result = iSize;
if (Aln != 0)
Result += Aln - (iSize%Aln);
@@ -411,7 +413,7 @@ bool DynamicMMap::Grow() {
if (GrowFactor <= 0)
return _error->Error(_("Unable to increase size of the MMap as automatic growing is disabled by user."));
- unsigned long const newSize = WorkSpace + GrowFactor;
+ unsigned long long const newSize = WorkSpace + GrowFactor;
if(Fd != 0) {
Fd->Seek(newSize - 1);
diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index 2bf2c1540..2ed4a95f8 100644
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -27,9 +27,8 @@
#include <string>
-#include <apt-pkg/fileutl.h>
-using std::string;
+class FileFd;
/* This should be a 32 bit type, larger tyes use too much ram and smaller
types are too small. Where ever possible 'unsigned long' should be used
@@ -41,7 +40,7 @@ class MMap
protected:
unsigned long Flags;
- unsigned long iSize;
+ unsigned long long iSize;
void *Base;
// In case mmap can not be used, we keep a dup of the file
@@ -60,8 +59,8 @@ class MMap
// Simple accessors
inline operator void *() {return Base;};
inline void *Data() {return Base;};
- inline unsigned long Size() {return iSize;};
- inline void AddSize(unsigned long const size) {iSize += size;};
+ inline unsigned long long Size() {return iSize;};
+ inline void AddSize(unsigned long long const size) {iSize += size;};
inline bool validData() const { return Base != (void *)-1 && Base != 0; };
// File manipulators
@@ -99,10 +98,10 @@ class DynamicMMap : public MMap
public:
// Allocation
- unsigned long RawAllocate(unsigned long Size,unsigned long Aln = 0);
+ unsigned long RawAllocate(unsigned long long Size,unsigned long Aln = 0);
unsigned long Allocate(unsigned long ItemSize);
unsigned long WriteString(const char *String,unsigned long Len = (unsigned long)-1);
- inline unsigned long WriteString(const string &S) {return WriteString(S.c_str(),S.length());};
+ inline unsigned long WriteString(const std::string &S) {return WriteString(S.c_str(),S.length());};
void UsePools(Pool &P,unsigned int Count) {Pools = &P; PoolCount = Count;};
DynamicMMap(FileFd &F,unsigned long Flags,unsigned long const &WorkSpace = 2*1024*1024,
diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
index 9ff5796c5..cb7d36088 100644
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -11,9 +11,12 @@
##################################################################### */
/*}}}*/
+#include <config.h>
#include <apt-pkg/configuration.h>
+#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
+
#include <iostream>
#include <stdio.h>
#include <stdlib.h>
@@ -23,6 +26,7 @@
#include "netrc.h"
+using std::string;
/* Get user and password from .netrc when given a machine name */
diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h
index 02a5eb09f..7b94eba88 100644
--- a/apt-pkg/contrib/netrc.h
+++ b/apt-pkg/contrib/netrc.h
@@ -14,16 +14,18 @@
#ifndef NETRC_H
#define NETRC_H
-#include <apt-pkg/strutl.h>
+#include <string>
#define DOT_CHAR "."
#define DIR_CHAR "/"
+class URI;
+
// Assume: password[0]=0, host[0] != 0.
// If login[0] = 0, search for login and password within a machine section
// in the netrc.
// If login[0] != 0, search for password within machine and login.
int parsenetrc (char *host, char *login, char *password, char *filename);
-void maybe_add_auth (URI &Uri, string NetRCFile);
+void maybe_add_auth (URI &Uri, std::string NetRCFile);
#endif
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 84ee4c124..317048845 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -8,15 +8,17 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/progress.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
-#include <apti18n.h>
-
#include <iostream>
#include <stdio.h>
#include <cstring>
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -35,7 +37,7 @@ OpProgress::OpProgress() : Current(0), Total(0), Size(0), SubTotal(1),
/* Current is the Base Overall progress in units of Total. Cur is the sub
progress in units of SubTotal. Size is a scaling factor that says what
percent of Total SubTotal is. */
-void OpProgress::Progress(unsigned long Cur)
+void OpProgress::Progress(unsigned long long Cur)
{
if (Total == 0 || Size == 0 || SubTotal == 0)
Percent = 0;
@@ -47,8 +49,8 @@ void OpProgress::Progress(unsigned long Cur)
// OpProgress::OverallProgress - Set the overall progress /*{{{*/
// ---------------------------------------------------------------------
/* */
-void OpProgress::OverallProgress(unsigned long Current, unsigned long Total,
- unsigned long Size,const string &Op)
+void OpProgress::OverallProgress(unsigned long long Current, unsigned long long Total,
+ unsigned long long Size,const string &Op)
{
this->Current = Current;
this->Total = Total;
@@ -65,7 +67,7 @@ void OpProgress::OverallProgress(unsigned long Current, unsigned long Total,
// OpProgress::SubProgress - Set the sub progress state /*{{{*/
// ---------------------------------------------------------------------
/* */
-void OpProgress::SubProgress(unsigned long SubTotal,const string &Op,
+void OpProgress::SubProgress(unsigned long long SubTotal,const string &Op,
float const Percent)
{
this->SubTotal = SubTotal;
diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index 3a914d17f..7635719bc 100644
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -25,26 +25,24 @@
#include <string>
#include <sys/time.h>
-using std::string;
-
class Configuration;
class OpProgress
{
- unsigned long Current;
- unsigned long Total;
- unsigned long Size;
- unsigned long SubTotal;
+ unsigned long long Current;
+ unsigned long long Total;
+ unsigned long long Size;
+ unsigned long long SubTotal;
float LastPercent;
// Change reduction code
struct timeval LastTime;
- string LastOp;
- string LastSubOp;
+ std::string LastOp;
+ std::string LastSubOp;
protected:
- string Op;
- string SubOp;
+ std::string Op;
+ std::string SubOp;
float Percent;
bool MajorChange;
@@ -54,10 +52,10 @@ class OpProgress
public:
- void Progress(unsigned long Current);
- void SubProgress(unsigned long SubTotal, const string &Op = "", float const Percent = -1);
- void OverallProgress(unsigned long Current,unsigned long Total,
- unsigned long Size,const string &Op);
+ void Progress(unsigned long long Current);
+ void SubProgress(unsigned long long SubTotal, const std::string &Op = "", float const Percent = -1);
+ void OverallProgress(unsigned long long Current,unsigned long long Total,
+ unsigned long long Size,const std::string &Op);
virtual void Done() {};
OpProgress();
@@ -67,8 +65,8 @@ class OpProgress
class OpTextProgress : public OpProgress
{
protected:
-
- string OldOp;
+
+ std::string OldOp;
bool NoUpdate;
bool NoDisplay;
unsigned long LastLen;
diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index 5b9db202d..b5a6a2440 100644
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -29,6 +29,8 @@
*/
/*}}} */
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/sha1.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/macros.h>
@@ -36,7 +38,6 @@
#include <string.h>
#include <unistd.h>
#include <inttypes.h>
-#include <config.h>
/*}}}*/
// SHA1Transform - Alters an existing SHA-1 hash /*{{{*/
@@ -241,7 +242,7 @@ SHA1SumValue SHA1Summation::Result()
// SHA1Summation::Add - Adds content of buffer into the checksum /*{{{*/
// ---------------------------------------------------------------------
/* May not be called after Result() is called */
-bool SHA1Summation::Add(const unsigned char *data,unsigned long len)
+bool SHA1Summation::Add(const unsigned char *data,unsigned long long len)
{
if (Done)
return false;
diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 2701fc67e..b4b139a22 100644
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -18,9 +18,6 @@
#include <cstring>
#include <algorithm>
-using std::string;
-using std::min;
-
#include "hashsum_template.h"
typedef HashSumValue<160> SHA1SumValue;
@@ -34,7 +31,7 @@ class SHA1Summation : public SummationImplementation
bool Done;
public:
- bool Add(const unsigned char *inbuf, unsigned long inlen);
+ bool Add(const unsigned char *inbuf, unsigned long long inlen);
using SummationImplementation::Add;
SHA1SumValue Result();
diff --git a/apt-pkg/contrib/sha2.h b/apt-pkg/contrib/sha2.h
index 386225889..51c921dbd 100644
--- a/apt-pkg/contrib/sha2.h
+++ b/apt-pkg/contrib/sha2.h
@@ -30,7 +30,7 @@ class SHA2SummationBase : public SummationImplementation
protected:
bool Done;
public:
- bool Add(const unsigned char *inbuf, unsigned long len) = 0;
+ bool Add(const unsigned char *inbuf, unsigned long long len) = 0;
void Result();
};
@@ -41,7 +41,7 @@ class SHA256Summation : public SHA2SummationBase
unsigned char Sum[32];
public:
- bool Add(const unsigned char *inbuf, unsigned long len)
+ bool Add(const unsigned char *inbuf, unsigned long long len)
{
if (Done)
return false;
@@ -73,7 +73,7 @@ class SHA512Summation : public SHA2SummationBase
unsigned char Sum[64];
public:
- bool Add(const unsigned char *inbuf, unsigned long len)
+ bool Add(const unsigned char *inbuf, unsigned long long len)
{
if (Done)
return false;
diff --git a/apt-pkg/contrib/sha2_internal.cc b/apt-pkg/contrib/sha2_internal.cc
index 565db2f91..6d27e8f2b 100644
--- a/apt-pkg/contrib/sha2_internal.cc
+++ b/apt-pkg/contrib/sha2_internal.cc
@@ -31,6 +31,7 @@
*
* $Id: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $
*/
+#include <config.h>
#include <string.h> /* memcpy()/memset() or bcopy()/bzero() */
#include <assert.h> /* assert() */
@@ -604,7 +605,12 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
*context->buffer = 0x80;
}
/* Set the bit count: */
- *(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount;
+ union {
+ sha2_byte* c;
+ sha2_word64* l;
+ } bitcount;
+ bitcount.c = &context->buffer[SHA256_SHORT_BLOCK_LENGTH];
+ *(bitcount.l) = context->bitcount;
/* Final transform: */
SHA256_Transform(context, (sha2_word32*)context->buffer);
@@ -921,8 +927,13 @@ static void SHA512_Last(SHA512_CTX* context) {
*context->buffer = 0x80;
}
/* Store the length of input data (in bits): */
- *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1];
- *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0];
+ union {
+ sha2_byte* c;
+ sha2_word64* l;
+ } bitcount;
+ bitcount.c = &context->buffer[SHA512_SHORT_BLOCK_LENGTH];
+ bitcount.l[0] = context->bitcount[1];
+ bitcount.l[1] = context->bitcount[0];
/* Final transform: */
SHA512_Transform(context, (sha2_word64*)context->buffer);
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 867bb313b..861cdcbeb 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -15,12 +15,12 @@
##################################################################### */
/*}}}*/
// Includes /*{{{*/
+#include <config.h>
+
#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/error.h>
-#include <apti18n.h>
-
#include <ctype.h>
#include <string.h>
#include <stdio.h>
@@ -31,7 +31,7 @@
#include <stdarg.h>
#include <iconv.h>
-#include "config.h"
+#include <apti18n.h>
using namespace std;
/*}}}*/
@@ -179,14 +179,14 @@ bool ParseQuoteWord(const char *&String,string &Res)
{
if (*C == '"')
{
- for (C++; *C != 0 && *C != '"'; C++);
- if (*C == 0)
+ C = strchr(C + 1, '"');
+ if (C == NULL)
return false;
}
if (*C == '[')
{
- for (C++; *C != 0 && *C != ']'; C++);
- if (*C == 0)
+ C = strchr(C + 1, ']');
+ if (C == NULL)
return false;
}
}
@@ -904,11 +904,10 @@ bool StrToTime(const string &Val,time_t &Result)
{
struct tm Tm;
char Month[10];
- const char *I = Val.c_str();
-
+
// Skip the day of the week
- for (;*I != 0 && *I != ' '; I++);
-
+ const char *I = strchr(Val.c_str(), ' ');
+
// Handle RFC 1123 time
Month[0] = 0;
if (sscanf(I," %d %3s %d %d:%d:%d GMT",&Tm.tm_mday,Month,&Tm.tm_year,
@@ -970,6 +969,34 @@ bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base)
return true;
}
/*}}}*/
+// StrToNum - Convert a fixed length string to a number /*{{{*/
+// ---------------------------------------------------------------------
+/* This is used in decoding the crazy fixed length string headers in
+ tar and ar files. */
+bool StrToNum(const char *Str,unsigned long long &Res,unsigned Len,unsigned Base)
+{
+ char S[30];
+ if (Len >= sizeof(S))
+ return false;
+ memcpy(S,Str,Len);
+ S[Len] = 0;
+
+ // All spaces is a zero
+ Res = 0;
+ unsigned I;
+ for (I = 0; S[I] == ' '; I++);
+ if (S[I] == 0)
+ return true;
+
+ char *End;
+ Res = strtoull(S,&End,Base);
+ if (End == S)
+ return false;
+
+ return true;
+}
+ /*}}}*/
+
// Base256ToNum - Convert a fixed length binary to a number /*{{{*/
// ---------------------------------------------------------------------
/* This is used in decoding the 256bit encoded fixed length fields in
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index fba85cf94..93f4bef4f 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -27,59 +27,56 @@
#include "macros.h"
-using std::string;
-using std::vector;
-using std::ostream;
-
-bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest);
+bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest);
char *_strstrip(char *String);
char *_strtabexpand(char *String,size_t Len);
-bool ParseQuoteWord(const char *&String,string &Res);
-bool ParseCWord(const char *&String,string &Res);
-string QuoteString(const string &Str,const char *Bad);
-string DeQuoteString(const string &Str);
-string DeQuoteString(string::const_iterator const &begin, string::const_iterator const &end);
+bool ParseQuoteWord(const char *&String,std::string &Res);
+bool ParseCWord(const char *&String,std::string &Res);
+std::string QuoteString(const std::string &Str,const char *Bad);
+std::string DeQuoteString(const std::string &Str);
+std::string DeQuoteString(std::string::const_iterator const &begin, std::string::const_iterator const &end);
// unescape (\0XX and \xXX) from a string
-string DeEscapeString(const string &input);
-
-string SizeToStr(double Bytes);
-string TimeToStr(unsigned long Sec);
-string Base64Encode(const string &Str);
-string OutputInDepth(const unsigned long Depth, const char* Separator=" ");
-string URItoFileName(const string &URI);
-string TimeRFC1123(time_t Date);
+std::string DeEscapeString(const std::string &input);
+
+std::string SizeToStr(double Bytes);
+std::string TimeToStr(unsigned long Sec);
+std::string Base64Encode(const std::string &Str);
+std::string OutputInDepth(const unsigned long Depth, const char* Separator=" ");
+std::string URItoFileName(const std::string &URI);
+std::string TimeRFC1123(time_t Date);
bool RFC1123StrToTime(const char* const str,time_t &time) __must_check;
bool FTPMDTMStrToTime(const char* const str,time_t &time) __must_check;
-__deprecated bool StrToTime(const string &Val,time_t &Result);
-string LookupTag(const string &Message,const char *Tag,const char *Default = 0);
-int StringToBool(const string &Text,int Default = -1);
-bool ReadMessages(int Fd, vector<string> &List);
+__deprecated bool StrToTime(const std::string &Val,time_t &Result);
+std::string LookupTag(const std::string &Message,const char *Tag,const char *Default = 0);
+int StringToBool(const std::string &Text,int Default = -1);
+bool ReadMessages(int Fd, std::vector<std::string> &List);
bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0);
+bool StrToNum(const char *Str,unsigned long long &Res,unsigned Len,unsigned Base = 0);
bool Base256ToNum(const char *Str,unsigned long &Res,unsigned int Len);
-bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length);
+bool Hex2Num(const std::string &Str,unsigned char *Num,unsigned int Length);
bool TokSplitString(char Tok,char *Input,char **List,
unsigned long ListMax);
-vector<string> VectorizeString(string const &haystack, char const &split) __attrib_const;
-void ioprintf(ostream &out,const char *format,...) __like_printf(2);
-void strprintf(string &out,const char *format,...) __like_printf(2);
+std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) __attrib_const;
+void ioprintf(std::ostream &out,const char *format,...) __like_printf(2);
+void strprintf(std::string &out,const char *format,...) __like_printf(2);
char *safe_snprintf(char *Buffer,char *End,const char *Format,...) __like_printf(3);
-bool CheckDomainList(const string &Host, const string &List);
+bool CheckDomainList(const std::string &Host, const std::string &List);
int tolower_ascii(int const c) __attrib_const __hot;
-string StripEpoch(const string &VerStr);
+std::string StripEpoch(const std::string &VerStr);
#define APT_MKSTRCMP(name,func) \
inline int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));}; \
inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \
-inline int name(const string& A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));}; \
-inline int name(const string& A,const string& B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());}; \
-inline int name(const string& A,const char *B,const char *BEnd) {return func(A.c_str(),A.c_str()+A.length(),B,BEnd);};
+inline int name(const std::string& A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));}; \
+inline int name(const std::string& A,const std::string& B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());}; \
+inline int name(const std::string& A,const char *B,const char *BEnd) {return func(A.c_str(),A.c_str()+A.length(),B,BEnd);};
#define APT_MKSTRCMP2(name,func) \
inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \
-inline int name(const string& A,const char *B) {return func(A.begin(),A.end(),B,B+strlen(B));}; \
-inline int name(const string& A,const string& B) {return func(A.begin(),A.end(),B.begin(),B.end());}; \
-inline int name(const string& A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);};
+inline int name(const std::string& A,const char *B) {return func(A.begin(),A.end(),B,B+strlen(B));}; \
+inline int name(const std::string& A,const std::string& B) {return func(A.begin(),A.end(),B.begin(),B.end());}; \
+inline int name(const std::string& A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);};
int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd);
int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd);
@@ -88,17 +85,17 @@ int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd)
case the definition of string::const_iterator is not the same as
const char * and we need these extra functions */
#if __GNUC__ >= 3
-int stringcmp(string::const_iterator A,string::const_iterator AEnd,
+int stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd,
const char *B,const char *BEnd);
-int stringcmp(string::const_iterator A,string::const_iterator AEnd,
- string::const_iterator B,string::const_iterator BEnd);
-int stringcasecmp(string::const_iterator A,string::const_iterator AEnd,
+int stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd,
+ std::string::const_iterator B,std::string::const_iterator BEnd);
+int stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd,
const char *B,const char *BEnd);
-int stringcasecmp(string::const_iterator A,string::const_iterator AEnd,
- string::const_iterator B,string::const_iterator BEnd);
+int stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd,
+ std::string::const_iterator B,std::string::const_iterator BEnd);
-inline int stringcmp(string::const_iterator A,string::const_iterator Aend,const char *B) {return stringcmp(A,Aend,B,B+strlen(B));};
-inline int stringcasecmp(string::const_iterator A,string::const_iterator Aend,const char *B) {return stringcasecmp(A,Aend,B,B+strlen(B));};
+inline int stringcmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcmp(A,Aend,B,B+strlen(B));};
+inline int stringcasecmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcasecmp(A,Aend,B,B+strlen(B));};
#endif
APT_MKSTRCMP2(stringcmp,stringcmp);
@@ -108,34 +105,34 @@ inline const char *DeNull(const char *s) {return (s == 0?"(null)":s);};
class URI
{
- void CopyFrom(const string &From);
+ void CopyFrom(const std::string &From);
public:
- string Access;
- string User;
- string Password;
- string Host;
- string Path;
+ std::string Access;
+ std::string User;
+ std::string Password;
+ std::string Host;
+ std::string Path;
unsigned int Port;
- operator string();
- inline void operator =(const string &From) {CopyFrom(From);};
+ operator std::string();
+ inline void operator =(const std::string &From) {CopyFrom(From);};
inline bool empty() {return Access.empty();};
- static string SiteOnly(const string &URI);
- static string NoUserPassword(const string &URI);
+ static std::string SiteOnly(const std::string &URI);
+ static std::string NoUserPassword(const std::string &URI);
- URI(string Path) {CopyFrom(Path);};
+ URI(std::string Path) {CopyFrom(Path);};
URI() : Port(0) {};
};
struct SubstVar
{
const char *Subst;
- const string *Contents;
+ const std::string *Contents;
};
-string SubstVar(string Str,const struct SubstVar *Vars);
-string SubstVar(const string &Str,const string &Subst,const string &Contents);
+std::string SubstVar(std::string Str,const struct SubstVar *Vars);
+std::string SubstVar(const std::string &Str,const std::string &Subst,const std::string &Contents);
struct RxChoiceList
{
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index e3d4063dc..27c1f7f32 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -9,6 +9,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/debindexfile.h>
#include <apt-pkg/debsrcrecords.h>
#include <apt-pkg/deblistparser.h>
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 678c22473..9e64d4476 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -26,14 +26,14 @@ class debStatusIndex : public pkgIndexFile
void *d;
protected:
- string File;
+ std::string File;
public:
virtual const Type *GetType() const;
// Interface for acquire
- virtual string Describe(bool Short) const {return File;};
+ virtual std::string Describe(bool Short) const {return File;};
// Interface for the Cache Generator
virtual bool Exists() const;
@@ -43,7 +43,7 @@ class debStatusIndex : public pkgIndexFile
bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog, unsigned long const Flag) const;
virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
- debStatusIndex(string File);
+ debStatusIndex(std::string File);
virtual ~debStatusIndex() {};
};
@@ -52,25 +52,25 @@ class debPackagesIndex : public pkgIndexFile
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
- string URI;
- string Dist;
- string Section;
- string Architecture;
+ std::string URI;
+ std::string Dist;
+ std::string Section;
+ std::string Architecture;
- string Info(const char *Type) const;
- string IndexFile(const char *Type) const;
- string IndexURI(const char *Type) const;
+ std::string Info(const char *Type) const;
+ std::string IndexFile(const char *Type) const;
+ std::string IndexURI(const char *Type) const;
public:
virtual const Type *GetType() const;
// Stuff for accessing files on remote items
- virtual string ArchiveInfo(pkgCache::VerIterator Ver) const;
- virtual string ArchiveURI(string File) const {return URI + File;};
+ virtual std::string ArchiveInfo(pkgCache::VerIterator Ver) const;
+ virtual std::string ArchiveURI(std::string File) const {return URI + File;};
// Interface for acquire
- virtual string Describe(bool Short) const;
+ virtual std::string Describe(bool Short) const;
// Interface for the Cache Generator
virtual bool Exists() const;
@@ -79,8 +79,8 @@ class debPackagesIndex : public pkgIndexFile
virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
- debPackagesIndex(string const &URI, string const &Dist, string const &Section,
- bool const &Trusted, string const &Arch = "native");
+ debPackagesIndex(std::string const &URI, std::string const &Dist, std::string const &Section,
+ bool const &Trusted, std::string const &Arch = "native");
virtual ~debPackagesIndex() {};
};
@@ -89,23 +89,23 @@ class debTranslationsIndex : public pkgIndexFile
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
- string URI;
- string Dist;
- string Section;
+ std::string URI;
+ std::string Dist;
+ std::string Section;
const char * const Language;
- string Info(const char *Type) const;
- string IndexFile(const char *Type) const;
- string IndexURI(const char *Type) const;
+ std::string Info(const char *Type) const;
+ std::string IndexFile(const char *Type) const;
+ std::string IndexURI(const char *Type) const;
- inline string TranslationFile() const {return string("Translation-").append(Language);};
+ inline std::string TranslationFile() const {return std::string("Translation-").append(Language);};
public:
virtual const Type *GetType() const;
// Interface for acquire
- virtual string Describe(bool Short) const;
+ virtual std::string Describe(bool Short) const;
virtual bool GetIndexes(pkgAcquire *Owner) const;
// Interface for the Cache Generator
@@ -115,7 +115,7 @@ class debTranslationsIndex : public pkgIndexFile
virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
- debTranslationsIndex(string URI,string Dist,string Section, char const * const Language);
+ debTranslationsIndex(std::string URI,std::string Dist,std::string Section, char const * const Language);
virtual ~debTranslationsIndex() {};
};
@@ -124,25 +124,25 @@ class debSourcesIndex : public pkgIndexFile
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
- string URI;
- string Dist;
- string Section;
+ std::string URI;
+ std::string Dist;
+ std::string Section;
- string Info(const char *Type) const;
- string IndexFile(const char *Type) const;
- string IndexURI(const char *Type) const;
+ std::string Info(const char *Type) const;
+ std::string IndexFile(const char *Type) const;
+ std::string IndexURI(const char *Type) const;
public:
virtual const Type *GetType() const;
// Stuff for accessing files on remote items
- virtual string SourceInfo(pkgSrcRecords::Parser const &Record,
+ virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record,
pkgSrcRecords::File const &File) const;
- virtual string ArchiveURI(string File) const {return URI + File;};
+ virtual std::string ArchiveURI(std::string File) const {return URI + File;};
// Interface for acquire
- virtual string Describe(bool Short) const;
+ virtual std::string Describe(bool Short) const;
// Interface for the record parsers
virtual pkgSrcRecords::Parser *CreateSrcParser() const;
@@ -152,7 +152,7 @@ class debSourcesIndex : public pkgIndexFile
virtual bool HasPackages() const {return false;};
virtual unsigned long Size() const;
- debSourcesIndex(string URI,string Dist,string Section,bool Trusted);
+ debSourcesIndex(std::string URI,std::string Dist,std::string Section,bool Trusted);
virtual ~debSourcesIndex() {};
};
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 89999fb44..28568d5e3 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -10,11 +10,14 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/deblistparser.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
#include <apt-pkg/crc-16.h>
#include <apt-pkg/md5.h>
#include <apt-pkg/macros.h>
@@ -23,6 +26,8 @@
#include <ctype.h>
/*}}}*/
+using std::string;
+
static debListParser::WordList PrioList[] = {{"important",pkgCache::State::Important},
{"required",pkgCache::State::Required},
{"standard",pkgCache::State::Standard},
@@ -517,9 +522,9 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
// Skip whitespace
for (;I != Stop && isspace(*I) != 0; I++);
Start = I;
- for (;I != Stop && *I != ')'; I++);
- if (I == Stop || Start == I)
- return 0;
+ I = (const char*) memchr(I, ')', Stop - I);
+ if (I == NULL || Start == I)
+ return 0;
// Skip trailing whitespace
const char *End = I;
@@ -670,6 +675,9 @@ bool debListParser::ParseProvides(pkgCache::VerIterator &Ver)
return _error->Error("Problem parsing Provides line");
if (Op != pkgCache::Dep::NoOp) {
_error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str());
+ } else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign) {
+ if (NewProvidesAllArch(Ver, Package, Version) == false)
+ return false;
} else {
if (NewProvides(Ver, Package, Arch, Version) == false)
return false;
@@ -792,21 +800,16 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
}
// seperate the tag from the data
- for (; buffer[len] != ':' && buffer[len] != '\0'; ++len)
- /* nothing */
- ;
- if (buffer[len] == '\0')
+ const char* dataStart = strchr(buffer + len, ':');
+ if (dataStart == NULL)
continue;
- char* dataStart = buffer + len;
+ len = dataStart - buffer;
for (++dataStart; *dataStart == ' '; ++dataStart)
/* nothing */
;
- char* dataEnd = dataStart;
- for (++dataEnd; *dataEnd != '\0'; ++dataEnd)
- /* nothing */
- ;
+ const char* dataEnd = (const char*)rawmemchr(dataStart, '\0');
// The last char should be a newline, but we can never be sure: #633350
- char* lineEnd = dataEnd;
+ const char* lineEnd = dataEnd;
for (--lineEnd; *lineEnd == '\r' || *lineEnd == '\n'; --lineEnd)
/* nothing */
;
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 41d712fbf..9519d9711 100644
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -12,7 +12,6 @@
#define PKGLIB_DEBLISTPARSER_H
#include <apt-pkg/pkgcachegen.h>
-#include <apt-pkg/indexfile.h>
#include <apt-pkg/tagfile.h>
class debListParser : public pkgCacheGenerator::ListParser
@@ -34,7 +33,7 @@ class debListParser : public pkgCacheGenerator::ListParser
pkgTagFile Tags;
pkgTagSection Section;
unsigned long iOffset;
- string Arch;
+ std::string Arch;
std::vector<std::string> Architectures;
bool MultiArchEnabled;
@@ -43,21 +42,21 @@ class debListParser : public pkgCacheGenerator::ListParser
bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,
unsigned int Type);
bool ParseProvides(pkgCache::VerIterator &Ver);
- bool NewProvidesAllArch(pkgCache::VerIterator &Ver, string const &Package, string const &Version);
- static bool GrabWord(string Word,WordList *List,unsigned char &Out);
+ bool NewProvidesAllArch(pkgCache::VerIterator &Ver, std::string const &Package, std::string const &Version);
+ static bool GrabWord(std::string Word,WordList *List,unsigned char &Out);
public:
- static unsigned char GetPrio(string Str);
+ static unsigned char GetPrio(std::string Str);
// These all operate against the current section
- virtual string Package();
- virtual string Architecture();
+ virtual std::string Package();
+ virtual std::string Architecture();
virtual bool ArchitectureAll();
- virtual string Version();
+ virtual std::string Version();
virtual bool NewVersion(pkgCache::VerIterator &Ver);
- virtual string Description();
- virtual string DescriptionLanguage();
+ virtual std::string Description();
+ virtual std::string DescriptionLanguage();
virtual MD5SumValue Description_md5();
virtual unsigned short VersionHash();
virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
@@ -68,15 +67,15 @@ class debListParser : public pkgCacheGenerator::ListParser
virtual bool Step();
bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File,
- string section);
+ std::string section);
static const char *ParseDepends(const char *Start,const char *Stop,
- string &Package,string &Ver,unsigned int &Op,
+ std::string &Package,std::string &Ver,unsigned int &Op,
bool const &ParseArchFlags = false,
bool const &StripMultiArch = true);
static const char *ConvertRelation(const char *I,unsigned int &Op);
- debListParser(FileFd *File, string const &Arch = "");
+ debListParser(FileFd *File, std::string const &Arch = "");
virtual ~debListParser() {};
};
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 11aa2635d..5d3a80aa5 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -1,14 +1,19 @@
// ijones, walters
+#include <config.h>
#include <apt-pkg/debmetaindex.h>
#include <apt-pkg/debindexfile.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/indexrecords.h>
+#include <apt-pkg/sourcelist.h>
#include <apt-pkg/error.h>
#include <set>
+#include <algorithm>
using namespace std;
@@ -197,7 +202,11 @@ vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
}
}
- std::vector<std::string> const lang = APT::Configuration::getLanguages(true);
+ std::vector<std::string> lang = APT::Configuration::getLanguages(true);
+ std::vector<std::string>::iterator lend = std::remove(lang.begin(), lang.end(), "none");
+ if (lend != lang.end())
+ lang.erase(lend);
+
if (lang.empty() == true)
return IndexTargets;
@@ -209,7 +218,6 @@ vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
s != sections.end(); ++s) {
for (std::vector<std::string>::const_iterator l = lang.begin();
l != lang.end(); ++l) {
- if (*l == "none") continue;
IndexTarget * Target = new OptionalIndexTarget();
Target->ShortDesc = "Translation-" + *l;
Target->MetaKey = TranslationIndexURISuffix(l->c_str(), *s);
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 695cfa7cc..0cba2d8a8 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -3,9 +3,10 @@
#define PKGLIB_DEBMETAINDEX_H
#include <apt-pkg/metaindex.h>
-#include <apt-pkg/sourcelist.h>
#include <map>
+#include <string>
+#include <vector>
class debReleaseIndex : public metaIndex {
public:
@@ -13,43 +14,43 @@ class debReleaseIndex : public metaIndex {
class debSectionEntry
{
public:
- debSectionEntry (string const &Section, bool const &IsSrc);
- string const Section;
+ debSectionEntry (std::string const &Section, bool const &IsSrc);
+ std::string const Section;
bool const IsSrc;
};
private:
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
- std::map<string, vector<debSectionEntry const*> > ArchEntries;
+ std::map<std::string, std::vector<debSectionEntry const*> > ArchEntries;
enum { ALWAYS_TRUSTED, NEVER_TRUSTED, CHECK_TRUST } Trusted;
public:
- debReleaseIndex(string const &URI, string const &Dist);
- debReleaseIndex(string const &URI, string const &Dist, bool const Trusted);
+ debReleaseIndex(std::string const &URI, std::string const &Dist);
+ debReleaseIndex(std::string const &URI, std::string const &Dist, bool const Trusted);
virtual ~debReleaseIndex();
- virtual string ArchiveURI(string const &File) const {return URI + File;};
+ virtual std::string ArchiveURI(std::string const &File) const {return URI + File;};
virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const;
- vector <struct IndexTarget *>* ComputeIndexTargets() const;
- string Info(const char *Type, string const &Section, string const &Arch="") const;
- string MetaIndexInfo(const char *Type) const;
- string MetaIndexFile(const char *Types) const;
- string MetaIndexURI(const char *Type) const;
- string IndexURI(const char *Type, string const &Section, string const &Arch="native") const;
- string IndexURISuffix(const char *Type, string const &Section, string const &Arch="native") const;
- string SourceIndexURI(const char *Type, const string &Section) const;
- string SourceIndexURISuffix(const char *Type, const string &Section) const;
- string TranslationIndexURI(const char *Type, const string &Section) const;
- string TranslationIndexURISuffix(const char *Type, const string &Section) const;
- virtual vector <pkgIndexFile *> *GetIndexFiles();
+ std::vector <struct IndexTarget *>* ComputeIndexTargets() const;
+ std::string Info(const char *Type, std::string const &Section, std::string const &Arch="") const;
+ std::string MetaIndexInfo(const char *Type) const;
+ std::string MetaIndexFile(const char *Types) const;
+ std::string MetaIndexURI(const char *Type) const;
+ std::string IndexURI(const char *Type, std::string const &Section, std::string const &Arch="native") const;
+ std::string IndexURISuffix(const char *Type, std::string const &Section, std::string const &Arch="native") const;
+ std::string SourceIndexURI(const char *Type, const std::string &Section) const;
+ std::string SourceIndexURISuffix(const char *Type, const std::string &Section) const;
+ std::string TranslationIndexURI(const char *Type, const std::string &Section) const;
+ std::string TranslationIndexURISuffix(const char *Type, const std::string &Section) const;
+ virtual std::vector <pkgIndexFile *> *GetIndexFiles();
void SetTrusted(bool const Trusted);
virtual bool IsTrusted() const;
- void PushSectionEntry(vector<string> const &Archs, const debSectionEntry *Entry);
- void PushSectionEntry(string const &Arch, const debSectionEntry *Entry);
+ void PushSectionEntry(std::vector<std::string> const &Archs, const debSectionEntry *Entry);
+ void PushSectionEntry(std::string const &Arch, const debSectionEntry *Entry);
void PushSectionEntry(const debSectionEntry *Entry);
};
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 2571aae52..1afa7b74d 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -8,13 +8,19 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/debrecords.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/fileutl.h>
+
#include <langinfo.h>
/*}}}*/
+using std::string;
+
// RecordParser::debRecordParser - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -133,8 +139,8 @@ string debRecordParser::LongDesc()
orig = Section.FindS("Description").c_str();
else
{
- vector<string> const lang = APT::Configuration::getLanguages();
- for (vector<string>::const_iterator l = lang.begin();
+ std::vector<string> const lang = APT::Configuration::getLanguages();
+ for (std::vector<string>::const_iterator l = lang.begin();
orig.empty() && l != lang.end(); ++l)
orig = Section.FindS(string("Description-").append(*l).c_str());
}
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index 7868bfa3d..9c7ea6b48 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -15,8 +15,8 @@
#define PKGLIB_DEBRECORDS_H
#include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/indexfile.h>
#include <apt-pkg/tagfile.h>
+#include <apt-pkg/fileutl.h>
class debRecordParser : public pkgRecords::Parser
{
@@ -35,27 +35,27 @@ class debRecordParser : public pkgRecords::Parser
public:
// These refer to the archive file for the Version
- virtual string FileName();
- virtual string MD5Hash();
- virtual string SHA1Hash();
- virtual string SHA256Hash();
- virtual string SHA512Hash();
- virtual string SourcePkg();
- virtual string SourceVer();
+ virtual std::string FileName();
+ virtual std::string MD5Hash();
+ virtual std::string SHA1Hash();
+ virtual std::string SHA256Hash();
+ virtual std::string SHA512Hash();
+ virtual std::string SourcePkg();
+ virtual std::string SourceVer();
// These are some general stats about the package
- virtual string Maintainer();
- virtual string ShortDesc();
- virtual string LongDesc();
- virtual string Name();
- virtual string Homepage();
+ virtual std::string Maintainer();
+ virtual std::string ShortDesc();
+ virtual std::string LongDesc();
+ virtual std::string Name();
+ virtual std::string Homepage();
// An arbitrary custom field
- virtual string RecordField(const char *fieldName);
+ virtual std::string RecordField(const char *fieldName);
virtual void GetRec(const char *&Start,const char *&Stop);
- debRecordParser(string FileName,pkgCache &Cache);
+ debRecordParser(std::string FileName,pkgCache &Cache);
virtual ~debRecordParser() {};
};
diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 749305005..ce55ccd1f 100644
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -9,6 +9,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/deblistparser.h>
#include <apt-pkg/debsrcrecords.h>
#include <apt-pkg/error.h>
@@ -19,6 +21,8 @@
using std::max;
/*}}}*/
+using std::string;
+
// SrcRecordParser::Binaries - Return the binaries field /*{{{*/
// ---------------------------------------------------------------------
/* This member parses the binaries field into a pair of class arrays and
@@ -28,25 +32,32 @@ using std::max;
used during scanning to find the right package */
const char **debSrcRecordParser::Binaries()
{
- // This should use Start/Stop too, it is supposed to be efficient after all.
- string Bins = Sect.FindS("Binary");
- if (Bins.empty() == true || Bins.length() >= 102400)
- return 0;
-
- if (Bins.length() >= BufSize)
- {
- delete [] Buffer;
- // allocate new size based on buffer (but never smaller than 4000)
- BufSize = max((unsigned int)4000, max((unsigned int)Bins.length()+1,2*BufSize));
- Buffer = new char[BufSize];
- }
+ const char *Start, *End;
+ if (Sect.Find("Binary", Start, End) == false)
+ return NULL;
+ for (; isspace(*Start) != 0; ++Start);
+ if (Start >= End)
+ return NULL;
+
+ StaticBinList.clear();
+ free(Buffer);
+ Buffer = strndup(Start, End - Start);
- strcpy(Buffer,Bins.c_str());
- if (TokSplitString(',',Buffer,StaticBinList,
- sizeof(StaticBinList)/sizeof(StaticBinList[0])) == false)
- return 0;
+ char* bin = Buffer;
+ do {
+ char* binStartNext = strchrnul(bin, ',');
+ char* binEnd = binStartNext - 1;
+ for (; isspace(*binEnd) != 0; --binEnd)
+ binEnd = '\0';
+ StaticBinList.push_back(bin);
+ if (*binStartNext != ',')
+ break;
+ *binStartNext = '\0';
+ for (bin = binStartNext + 1; isspace(*bin) != 0; ++bin);
+ } while (*bin != '\0');
+ StaticBinList.push_back(NULL);
- return (const char **)StaticBinList;
+ return (const char **) &StaticBinList[0];
}
/*}}}*/
// SrcRecordParser::BuildDepends - Return the Build-Depends information /*{{{*/
@@ -55,7 +66,7 @@ const char **debSrcRecordParser::Binaries()
package/version records representing the build dependency. The returned
array need not be freed and will be reused by the next call to this
function */
-bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps,
+bool debSrcRecordParser::BuildDepends(std::vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps,
bool const &ArchOnly, bool const &StripMultiArch)
{
unsigned int I;
@@ -100,7 +111,7 @@ bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec>
// ---------------------------------------------------------------------
/* This parses the list of files and returns it, each file is required to have
a complete source package */
-bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
+bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
{
List.erase(List.begin(),List.end());
diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h
index aa859b0e6..4c8d03224 100644
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@ -24,10 +24,9 @@ class debSrcRecordParser : public pkgSrcRecords::Parser
FileFd Fd;
pkgTagFile Tags;
pkgTagSection Sect;
- char *StaticBinList[400];
+ std::vector<const char*> StaticBinList;
unsigned long iOffset;
char *Buffer;
- unsigned int BufSize;
public:
@@ -35,24 +34,24 @@ class debSrcRecordParser : public pkgSrcRecords::Parser
virtual bool Step() {iOffset = Tags.Offset(); return Tags.Step(Sect);};
virtual bool Jump(unsigned long const &Off) {iOffset = Off; return Tags.Jump(Sect,Off);};
- virtual string Package() const {return Sect.FindS("Package");};
- virtual string Version() const {return Sect.FindS("Version");};
- virtual string Maintainer() const {return Sect.FindS("Maintainer");};
- virtual string Section() const {return Sect.FindS("Section");};
+ virtual std::string Package() const {return Sect.FindS("Package");};
+ virtual std::string Version() const {return Sect.FindS("Version");};
+ virtual std::string Maintainer() const {return Sect.FindS("Maintainer");};
+ virtual std::string Section() const {return Sect.FindS("Section");};
virtual const char **Binaries();
- virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true);
+ virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true);
virtual unsigned long Offset() {return iOffset;};
- virtual string AsStr()
+ virtual std::string AsStr()
{
const char *Start=0,*Stop=0;
Sect.GetSection(Start,Stop);
- return string(Start,Stop);
+ return std::string(Start,Stop);
};
- virtual bool Files(vector<pkgSrcRecords::File> &F);
+ virtual bool Files(std::vector<pkgSrcRecords::File> &F);
- debSrcRecordParser(string const &File,pkgIndexFile const *Index)
+ debSrcRecordParser(std::string const &File,pkgIndexFile const *Index)
: Parser(Index), Fd(File,FileFd::ReadOnlyGzip), Tags(&Fd,102400),
- Buffer(0), BufSize(0) {}
+ Buffer(NULL) {}
virtual ~debSrcRecordParser();
};
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index 7644bc66b..7ed6936c3 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -10,6 +10,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/debsystem.h>
#include <apt-pkg/debversion.h>
#include <apt-pkg/debindexfile.h>
@@ -17,13 +19,16 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
-#include <apti18n.h>
#include <sys/types.h>
#include <unistd.h>
#include <dirent.h>
#include <errno.h>
+
+#include <apti18n.h>
/*}}}*/
+using std::string;
+
debSystem debSys;
class debSystemPrivate {
@@ -216,7 +221,7 @@ signed debSystem::Score(Configuration const &Cnf)
// System::AddStatusFiles - Register the status files /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool debSystem::AddStatusFiles(vector<pkgIndexFile *> &List)
+bool debSystem::AddStatusFiles(std::vector<pkgIndexFile *> &List)
{
if (d->StatusFile == 0)
d->StatusFile = new debStatusIndex(_config->FindFile("Dir::State::status"));
diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h
index 232155256..855123516 100644
--- a/apt-pkg/deb/debsystem.h
+++ b/apt-pkg/deb/debsystem.h
@@ -11,10 +11,12 @@
#define PKGLIB_DEBSYSTEM_H
#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/pkgcache.h>
class debSystemPrivate;
-
class debStatusIndex;
+class pkgDepCache;
+
class debSystem : public pkgSystem
{
// private d-pointer
diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc
index 755ffbe96..a02699a44 100644
--- a/apt-pkg/deb/debversion.cc
+++ b/apt-pkg/deb/debversion.cc
@@ -10,7 +10,7 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#define APT_COMPATIBILITY 986
+#include <config.h>
#include <apt-pkg/debversion.h>
#include <apt-pkg/pkgcache.h>
@@ -127,14 +127,12 @@ int debVersioningSystem::CmpFragment(const char *A,const char *AEnd,
int debVersioningSystem::DoCmpVersion(const char *A,const char *AEnd,
const char *B,const char *BEnd)
{
- // Strip off the epoch and compare it
- const char *lhs = A;
- const char *rhs = B;
- for (;lhs != AEnd && *lhs != ':'; lhs++);
- for (;rhs != BEnd && *rhs != ':'; rhs++);
- if (lhs == AEnd)
+ // Strip off the epoch and compare it
+ const char *lhs = (const char*) memchr(A, ':', AEnd - A);
+ const char *rhs = (const char*) memchr(B, ':', BEnd - B);
+ if (lhs == NULL)
lhs = A;
- if (rhs == BEnd)
+ if (rhs == NULL)
rhs = B;
// Special case: a zero epoch is the same as no epoch,
@@ -169,15 +167,12 @@ int debVersioningSystem::DoCmpVersion(const char *A,const char *AEnd,
if (rhs != B)
rhs++;
- // Find the last -
- const char *dlhs = AEnd-1;
- const char *drhs = BEnd-1;
- for (;dlhs > lhs && *dlhs != '-'; dlhs--);
- for (;drhs > rhs && *drhs != '-'; drhs--);
-
- if (dlhs == lhs)
+ // Find the last -
+ const char *dlhs = (const char*) memrchr(lhs, '-', AEnd - lhs);
+ const char *drhs = (const char*) memrchr(rhs, '-', BEnd - rhs);
+ if (dlhs == NULL)
dlhs = AEnd;
- if (drhs == rhs)
+ if (drhs == NULL)
drhs = BEnd;
// Compare the main version
@@ -262,7 +257,7 @@ bool debVersioningSystem::CheckDep(const char *PkgVer,
// debVS::UpstreamVersion - Return the upstream version string /*{{{*/
// ---------------------------------------------------------------------
/* This strips all the debian specific information from the version number */
-string debVersioningSystem::UpstreamVersion(const char *Ver)
+std::string debVersioningSystem::UpstreamVersion(const char *Ver)
{
// Strip off the bit before the first colon
const char *I = Ver;
@@ -277,6 +272,6 @@ string debVersioningSystem::UpstreamVersion(const char *Ver)
if (*I == '-')
Last = I - Ver;
- return string(Ver,Last);
+ return std::string(Ver,Last);
}
/*}}}*/
diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h
index 56fb67887..f1d6f3cc5 100644
--- a/apt-pkg/deb/debversion.h
+++ b/apt-pkg/deb/debversion.h
@@ -32,39 +32,11 @@ class debVersioningSystem : public pkgVersioningSystem
{
return DoCmpVersion(A,Aend,B,Bend);
}
- virtual string UpstreamVersion(const char *A);
+ virtual std::string UpstreamVersion(const char *A);
debVersioningSystem();
};
extern debVersioningSystem debVS;
-#ifdef APT_COMPATIBILITY
-#if APT_COMPATIBILITY != 986
-#warning "Using APT_COMPATIBILITY"
-#endif
-
-inline int pkgVersionCompare(const char *A, const char *B)
-{
- return debVS.CmpVersion(A,B);
-}
-inline int pkgVersionCompare(const char *A, const char *AEnd,
- const char *B, const char *BEnd)
-{
- return debVS.DoCmpVersion(A,AEnd,B,BEnd);
-}
-inline int pkgVersionCompare(string A,string B)
-{
- return debVS.CmpVersion(A,B);
-}
-inline bool pkgCheckDep(const char *DepVer,const char *PkgVer,int Op)
-{
- return debVS.CheckDep(PkgVer,Op,DepVer);
-}
-inline string pkgBaseVersion(const char *Ver)
-{
- return debVS.UpstreamVersion(Ver);
-}
-#endif
-
#endif
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 61927ff68..4a1bf42d5 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -8,6 +8,8 @@
##################################################################### */
/*}}}*/
// Includes /*{{{*/
+#include <config.h>
+
#include <apt-pkg/dpkgpm.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
@@ -16,6 +18,7 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/cachefile.h>
+#include <apt-pkg/packagemanager.h>
#include <unistd.h>
#include <stdlib.h>
@@ -39,7 +42,6 @@
#include <sys/ioctl.h>
#include <pty.h>
-#include <config.h>
#include <apti18n.h>
/*}}}*/
@@ -902,6 +904,28 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// create log
OpenLog();
+ // Generate the base argument list for dpkg
+ std::vector<const char *> Args;
+ unsigned long StartSize = 0;
+ string const Tmp = _config->Find("Dir::Bin::dpkg","dpkg");
+ Args.push_back(Tmp.c_str());
+ StartSize += Tmp.length();
+
+ // Stick in any custom dpkg options
+ Configuration::Item const *Opts = _config->Tree("DPkg::Options");
+ if (Opts != 0)
+ {
+ Opts = Opts->Child;
+ for (; Opts != 0; Opts = Opts->Next)
+ {
+ if (Opts->Value.empty() == true)
+ continue;
+ Args.push_back(Opts->Value.c_str());
+ StartSize += Opts->Value.length();
+ }
+ }
+ size_t const BaseArgs = Args.size();
+
// this loop is runs once per operation
for (vector<Item>::const_iterator I = List.begin(); I != List.end();)
{
@@ -923,11 +947,12 @@ bool pkgDPkgPM::Go(int OutStatusFd)
for (; J != List.end() && J->Op == I->Op; ++J)
/* nothing */;
- // Generate the argument list
- const char *Args[MaxArgs + 50];
// keep track of allocated strings for multiarch package names
- char *Packages[MaxArgs + 50];
- unsigned int pkgcount = 0;
+ std::vector<char *> Packages;
+
+ // start with the baseset of arguments
+ unsigned long Size = StartSize;
+ Args.erase(Args.begin() + BaseArgs, Args.end());
// Now check if we are within the MaxArgs limit
//
@@ -935,93 +960,70 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// the argument list is split in a way that A depends on B
// and they are in the same "--configure A B" run
// - with the split they may now be configured in different
- // runs
+ // runs, using Immediate-Configure-All can help prevent this.
if (J - I > (signed)MaxArgs)
+ {
J = I + MaxArgs;
-
- unsigned int n = 0;
- unsigned long Size = 0;
- string const Tmp = _config->Find("Dir::Bin::dpkg","dpkg");
- Args[n++] = Tmp.c_str();
- Size += strlen(Args[n-1]);
-
- // Stick in any custom dpkg options
- Configuration::Item const *Opts = _config->Tree("DPkg::Options");
- if (Opts != 0)
+ Args.reserve(MaxArgs + 10);
+ }
+ else
{
- Opts = Opts->Child;
- for (; Opts != 0; Opts = Opts->Next)
- {
- if (Opts->Value.empty() == true)
- continue;
- Args[n++] = Opts->Value.c_str();
- Size += Opts->Value.length();
- }
+ Args.reserve((J - I) + 10);
}
+
- char status_fd_buf[20];
int fd[2];
pipe(fd);
-
- Args[n++] = "--status-fd";
- Size += strlen(Args[n-1]);
+
+#define ADDARG(X) Args.push_back(X); Size += strlen(X)
+#define ADDARGC(X) Args.push_back(X); Size += sizeof(X) - 1
+
+ ADDARGC("--status-fd");
+ char status_fd_buf[20];
snprintf(status_fd_buf,sizeof(status_fd_buf),"%i", fd[1]);
- Args[n++] = status_fd_buf;
- Size += strlen(Args[n-1]);
+ ADDARG(status_fd_buf);
+ unsigned long const Op = I->Op;
switch (I->Op)
{
case Item::Remove:
- Args[n++] = "--force-depends";
- Size += strlen(Args[n-1]);
- Args[n++] = "--force-remove-essential";
- Size += strlen(Args[n-1]);
- Args[n++] = "--remove";
- Size += strlen(Args[n-1]);
+ ADDARGC("--force-depends");
+ ADDARGC("--force-remove-essential");
+ ADDARGC("--remove");
break;
case Item::Purge:
- Args[n++] = "--force-depends";
- Size += strlen(Args[n-1]);
- Args[n++] = "--force-remove-essential";
- Size += strlen(Args[n-1]);
- Args[n++] = "--purge";
- Size += strlen(Args[n-1]);
+ ADDARGC("--force-depends");
+ ADDARGC("--force-remove-essential");
+ ADDARGC("--purge");
break;
case Item::Configure:
- Args[n++] = "--configure";
- Size += strlen(Args[n-1]);
+ ADDARGC("--configure");
break;
case Item::ConfigurePending:
- Args[n++] = "--configure";
- Size += strlen(Args[n-1]);
- Args[n++] = "--pending";
- Size += strlen(Args[n-1]);
+ ADDARGC("--configure");
+ ADDARGC("--pending");
break;
case Item::TriggersPending:
- Args[n++] = "--triggers-only";
- Size += strlen(Args[n-1]);
- Args[n++] = "--pending";
- Size += strlen(Args[n-1]);
+ ADDARGC("--triggers-only");
+ ADDARGC("--pending");
break;
case Item::Install:
- Args[n++] = "--unpack";
- Size += strlen(Args[n-1]);
- Args[n++] = "--auto-deconfigure";
- Size += strlen(Args[n-1]);
+ ADDARGC("--unpack");
+ ADDARGC("--auto-deconfigure");
break;
}
if (NoTriggers == true && I->Op != Item::TriggersPending &&
I->Op != Item::ConfigurePending)
{
- Args[n++] = "--no-triggers";
- Size += strlen(Args[n-1]);
+ ADDARGC("--no-triggers");
}
+#undef ADDARGC
// Write in the file or package names
if (I->Op == Item::Install)
@@ -1030,10 +1032,10 @@ bool pkgDPkgPM::Go(int OutStatusFd)
{
if (I->File[0] != '/')
return _error->Error("Internal Error, Pathname to install is not absolute '%s'",I->File.c_str());
- Args[n++] = I->File.c_str();
- Size += strlen(Args[n-1]);
+ Args.push_back(I->File.c_str());
+ Size += I->File.length();
}
- }
+ }
else
{
string const nativeArch = _config->Find("APT::Architecture");
@@ -1045,29 +1047,35 @@ bool pkgDPkgPM::Go(int OutStatusFd)
if (I->Op == Item::Configure && disappearedPkgs.find(I->Pkg.Name()) != disappearedPkgs.end())
continue;
if (I->Pkg.Arch() == nativeArch || !strcmp(I->Pkg.Arch(), "all"))
- Args[n++] = I->Pkg.Name();
+ {
+ char const * const name = I->Pkg.Name();
+ ADDARG(name);
+ }
else
{
- Packages[pkgcount] = strdup(I->Pkg.FullName(false).c_str());
- Args[n++] = Packages[pkgcount++];
+ char * const fullname = strdup(I->Pkg.FullName(false).c_str());
+ Packages.push_back(fullname);
+ ADDARG(fullname);
}
- Size += strlen(Args[n-1]);
}
// skip configure action if all sheduled packages disappeared
if (oldSize == Size)
continue;
}
- Args[n] = 0;
+#undef ADDARG
+
J = I;
if (_config->FindB("Debug::pkgDPkgPM",false) == true)
{
- for (unsigned int k = 0; k != n; k++)
- clog << Args[k] << ' ';
+ for (std::vector<const char *>::const_iterator a = Args.begin();
+ a != Args.end(); ++a)
+ clog << *a << ' ';
clog << endl;
continue;
}
-
+ Args.push_back(NULL);
+
cout << flush;
clog << flush;
cerr << flush;
@@ -1077,8 +1085,13 @@ bool pkgDPkgPM::Go(int OutStatusFd)
it to all processes in the group. Since dpkg ignores the signal
it doesn't die but we do! So we must also ignore it */
sighandler_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN);
- sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN);
-
+ sighandler_t old_SIGINT = signal(SIGINT,SigINT);
+
+ // Check here for any SIGINT
+ if (pkgPackageManager::SigINTStop && (Op == Item::Remove || Op == Item::Purge || Op == Item::Install))
+ break;
+
+
// ignore SIGHUP as well (debian #463030)
sighandler_t old_SIGHUP = signal(SIGHUP,SIG_IGN);
@@ -1116,7 +1129,6 @@ bool pkgDPkgPM::Go(int OutStatusFd)
sigprocmask(SIG_SETMASK, &original_sigmask, 0);
}
}
-
// Fork dpkg
pid_t Child;
_config->Set("APT::Keep-Fds::",fd[1]);
@@ -1177,7 +1189,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
/* No Job Control Stop Env is a magic dpkg var that prevents it
from using sigstop */
putenv((char *)"DPKG_NO_TSTP=yes");
- execvp(Args[0],(char **)Args);
+ execvp(Args[0], (char**) &Args[0]);
cerr << "Could not exec dpkg!" << endl;
_exit(100);
}
@@ -1203,10 +1215,11 @@ bool pkgDPkgPM::Go(int OutStatusFd)
sigemptyset(&sigmask);
sigprocmask(SIG_BLOCK,&sigmask,&original_sigmask);
- /* clean up the temporary allocation for multiarch package names in
- the parent, so we don't leak memory when we return. */
- for (unsigned int i = 0; i < pkgcount; i++)
- free(Packages[i]);
+ /* free vectors (and therefore memory) as we don't need the included data anymore */
+ for (std::vector<char *>::const_iterator p = Packages.begin();
+ p != Packages.end(); ++p)
+ free(*p);
+ Packages.clear();
// the result of the waitpid call
int res;
@@ -1222,6 +1235,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// Restore sig int/quit
signal(SIGQUIT,old_SIGQUIT);
signal(SIGINT,old_SIGINT);
+
signal(SIGHUP,old_SIGHUP);
return _error->Errno("waitpid","Couldn't wait for subprocess");
}
@@ -1262,6 +1276,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// Restore sig int/quit
signal(SIGQUIT,old_SIGQUIT);
signal(SIGINT,old_SIGINT);
+
signal(SIGHUP,old_SIGHUP);
if(master >= 0)
@@ -1299,6 +1314,9 @@ bool pkgDPkgPM::Go(int OutStatusFd)
}
}
CloseLog();
+
+ if (pkgPackageManager::SigINTStop)
+ _error->Warning(_("Operation was interrupted before it could finish"));
if (RunScripts("DPkg::Post-Invoke") == false)
return false;
@@ -1323,6 +1341,11 @@ bool pkgDPkgPM::Go(int OutStatusFd)
Cache.writeStateFile(NULL);
return true;
}
+
+void SigINT(int sig) {
+ if (_config->FindB("APT::Immediate-Configure-All",false))
+ pkgPackageManager::SigINTStop = true;
+}
/*}}}*/
// pkgDpkgPM::Reset - Dump the contents of the command list /*{{{*/
// ---------------------------------------------------------------------
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index ddf9485c7..6b62360b7 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -15,9 +15,6 @@
#include <map>
#include <stdio.h>
-using std::vector;
-using std::map;
-
class pkgDPkgPMPrivate;
class pkgDPkgPM : public pkgPackageManager
@@ -38,7 +35,7 @@ class pkgDPkgPM : public pkgPackageManager
needs to declare a Replaces on the disappeared package.
\param pkgname Name of the package that disappeared
*/
- void handleDisappearAction(string const &pkgname);
+ void handleDisappearAction(std::string const &pkgname);
protected:
int pkgFailures;
@@ -53,11 +50,11 @@ class pkgDPkgPM : public pkgPackageManager
// the dpkg states that the pkg will run through, the string is
// the package, the vector contains the dpkg states that the package
// will go through
- map<string,vector<struct DpkgState> > PackageOps;
+ std::map<std::string,std::vector<struct DpkgState> > PackageOps;
// the dpkg states that are already done; the string is the package
// the int is the state that is already done (e.g. a package that is
// going to be install is already in state "half-installed")
- map<string,unsigned int> PackageOpsDone;
+ std::map<std::string,unsigned int> PackageOpsDone;
// progress reporting
unsigned int PackagesDone;
@@ -66,19 +63,19 @@ class pkgDPkgPM : public pkgPackageManager
struct Item
{
enum Ops {Install, Configure, Remove, Purge, ConfigurePending, TriggersPending} Op;
- string File;
+ std::string File;
PkgIterator Pkg;
- Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op),
+ Item(Ops Op,PkgIterator Pkg,std::string File = "") : Op(Op),
File(File), Pkg(Pkg) {};
Item() {};
};
- vector<Item> List;
+ std::vector<Item> List;
// Helpers
bool RunScriptsWithPkgs(const char *Cnf);
bool SendV2Pkgs(FILE *F);
- void WriteHistoryTag(string const &tag, string value);
+ void WriteHistoryTag(std::string const &tag, std::string value);
// apport integration
void WriteApportReport(const char *pkgpath, const char *errormsg);
@@ -94,7 +91,7 @@ class pkgDPkgPM : public pkgPackageManager
void ProcessDpkgStatusLine(int OutStatusFd, char *line);
// The Actuall installation implementation
- virtual bool Install(PkgIterator Pkg,string File);
+ virtual bool Install(PkgIterator Pkg,std::string File);
virtual bool Configure(PkgIterator Pkg);
virtual bool Remove(PkgIterator Pkg,bool Purge = false);
virtual bool Go(int StatusFd=-1);
@@ -106,4 +103,6 @@ class pkgDPkgPM : public pkgPackageManager
virtual ~pkgDPkgPM();
};
+void SigINT(int sig);
+
#endif
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 9104c5d56..456e4b012 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -8,28 +8,33 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/depcache.h>
#include <apt-pkg/version.h>
#include <apt-pkg/versionmatch.h>
#include <apt-pkg/error.h>
#include <apt-pkg/sptr.h>
#include <apt-pkg/algorithms.h>
-
#include <apt-pkg/fileutl.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/tagfile.h>
+#include <apt-pkg/progress.h>
#include <iostream>
-#include <sstream>
+#include <sstream>
#include <set>
#include <sys/stat.h>
-#include <apti18n.h>
+#include <apti18n.h>
/*}}}*/
+
+using std::string;
+
// helper for Install-Recommends-Sections and Never-MarkAuto-Sections /*{{{*/
static bool
ConfigValueInSubTree(const char* SubTree, const char *needle)
@@ -169,14 +174,14 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/
string const state = _config->FindFile("Dir::State::extended_states");
if(RealFileExists(state)) {
state_file.Open(state, FileFd::ReadOnly);
- int const file_size = state_file.Size();
+ off_t const file_size = state_file.Size();
if(Prog != NULL)
Prog->OverallProgress(0, file_size, 1,
_("Reading state information"));
pkgTagFile tagfile(&state_file);
pkgTagSection section;
- int amt = 0;
+ off_t amt = 0;
bool const debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false);
while(tagfile.Step(section)) {
string const pkgname = section.FindS("Package");
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 66cb7dbab..f6e6c0afc 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -40,12 +40,13 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/error.h>
#include <vector>
#include <memory>
#include <set>
+#include <list>
+
+class OpProgress;
class pkgDepCache : protected pkgCache::Namespace
{
@@ -338,9 +339,9 @@ class pkgDepCache : protected pkgCache::Namespace
inline Header &Head() {return *Cache->HeaderP;};
inline GrpIterator GrpBegin() {return Cache->GrpBegin();};
inline PkgIterator PkgBegin() {return Cache->PkgBegin();};
- inline GrpIterator FindGrp(string const &Name) {return Cache->FindGrp(Name);};
- inline PkgIterator FindPkg(string const &Name) {return Cache->FindPkg(Name);};
- inline PkgIterator FindPkg(string const &Name, string const &Arch) {return Cache->FindPkg(Name, Arch);};
+ inline GrpIterator FindGrp(std::string const &Name) {return Cache->FindGrp(Name);};
+ inline PkgIterator FindPkg(std::string const &Name) {return Cache->FindPkg(Name);};
+ inline PkgIterator FindPkg(std::string const &Name, std::string const &Arch) {return Cache->FindPkg(Name, Arch);};
inline pkgCache &GetCache() {return *Cache;};
inline pkgVersioningSystem &VS() {return *Cache->VS;};
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 0ee0fcf94..791aac72f 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -5,19 +5,28 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/edsp.h>
#include <apt-pkg/error.h>
+#include <apt-pkg/cacheset.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/version.h>
#include <apt-pkg/policy.h>
#include <apt-pkg/tagfile.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/progress.h>
-#include <apti18n.h>
#include <limits>
-
#include <stdio.h>
+
+#include <string>
+
+#include <apti18n.h>
/*}}}*/
+using std::string;
+
// we could use pkgCache::DepType and ::Priority, but these would be localized strings…
const char * const EDSP::PrioMap[] = {0, "important", "required", "standard",
"optional", "extra"};
diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index 743c3f5d1..c14309422 100644
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -9,12 +9,17 @@
#ifndef PKGLIB_EDSP_H
#define PKGLIB_EDSP_H
-#include <apt-pkg/depcache.h>
-#include <apt-pkg/cacheset.h>
-#include <apt-pkg/progress.h>
+#include <apt-pkg/pkgcache.h>
+#include <list>
#include <string>
+namespace APT {
+ class PackageSet;
+};
+class pkgDepCache;
+class OpProgress;
+
class EDSP /*{{{*/
{
// we could use pkgCache::DepType and ::Priority, but these would be localized strings…
diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index f5881e663..058cef636 100644
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -6,6 +6,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/edspindexfile.h>
#include <apt-pkg/edsplistparser.h>
#include <apt-pkg/sourcelist.h>
@@ -13,6 +15,7 @@
#include <apt-pkg/progress.h>
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
#include <apt-pkg/acquire-item.h>
#include <sys/stat.h>
diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h
index 0053388eb..9670c4837 100644
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -8,7 +8,6 @@
#ifndef PKGLIB_EDSPINDEXFILE_H
#define PKGLIB_EDSPINDEXFILE_H
-#include <apt-pkg/indexfile.h>
#include <apt-pkg/debindexfile.h>
class edspIndex : public debStatusIndex
@@ -22,7 +21,7 @@ class edspIndex : public debStatusIndex
virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
- edspIndex(string File);
+ edspIndex(std::string File);
};
#endif
diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc
index 3349e8cce..bcfdb1017 100644
--- a/apt-pkg/edsp/edsplistparser.cc
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -9,6 +9,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/edsplistparser.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
@@ -18,7 +20,7 @@
/*}}}*/
// ListParser::edspListParser - Constructor /*{{{*/
-edspListParser::edspListParser(FileFd *File, string const &Arch) : debListParser(File, Arch)
+edspListParser::edspListParser(FileFd *File, std::string const &Arch) : debListParser(File, Arch)
{}
/*}}}*/
// ListParser::NewVersion - Fill in the version structure /*{{{*/
@@ -31,11 +33,11 @@ bool edspListParser::NewVersion(pkgCache::VerIterator &Ver)
// ListParser::Description - Return the description string /*{{{*/
// ---------------------------------------------------------------------
/* Sorry, no description for the resolvers… */
-string edspListParser::Description()
+std::string edspListParser::Description()
{
return "";
}
-string edspListParser::DescriptionLanguage()
+std::string edspListParser::DescriptionLanguage()
{
return "";
}
@@ -83,7 +85,7 @@ bool edspListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
/*}}}*/
// ListParser::LoadReleaseInfo - Load the release information /*{{{*/
bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
- FileFd &File, string component)
+ FileFd &File, std::string component)
{
return true;
}
diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h
index ec9f09905..5d82716c7 100644
--- a/apt-pkg/edsp/edsplistparser.h
+++ b/apt-pkg/edsp/edsplistparser.h
@@ -12,23 +12,22 @@
#define PKGLIB_EDSPLISTPARSER_H
#include <apt-pkg/deblistparser.h>
-#include <apt-pkg/pkgcachegen.h>
-#include <apt-pkg/indexfile.h>
-#include <apt-pkg/tagfile.h>
+
+class FileFd;
class edspListParser : public debListParser
{
public:
virtual bool NewVersion(pkgCache::VerIterator &Ver);
- virtual string Description();
- virtual string DescriptionLanguage();
+ virtual std::string Description();
+ virtual std::string DescriptionLanguage();
virtual MD5SumValue Description_md5();
virtual unsigned short VersionHash();
bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File,
- string section);
+ std::string section);
- edspListParser(FileFd *File, string const &Arch = "");
+ edspListParser(FileFd *File, std::string const &Arch = "");
protected:
virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc
index ac0bb8beb..6b9207451 100644
--- a/apt-pkg/edsp/edspsystem.cc
+++ b/apt-pkg/edsp/edspsystem.cc
@@ -9,17 +9,20 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/edspsystem.h>
#include <apt-pkg/debversion.h>
#include <apt-pkg/edspindexfile.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
-#include <apti18n.h>
#include <sys/types.h>
#include <unistd.h>
#include <dirent.h>
#include <errno.h>
+
+#include <apti18n.h>
/*}}}*/
edspSystem edspSys;
@@ -94,7 +97,7 @@ signed edspSystem::Score(Configuration const &Cnf)
}
/*}}}*/
// System::AddStatusFiles - Register the status files /*{{{*/
-bool edspSystem::AddStatusFiles(vector<pkgIndexFile *> &List)
+bool edspSystem::AddStatusFiles(std::vector<pkgIndexFile *> &List)
{
if (StatusFile == 0)
{
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 747e464be..4df018ef4 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -10,7 +10,7 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include "indexcopy.h"
+#include<config.h>
#include <apt-pkg/error.h>
#include <apt-pkg/progress.h>
@@ -21,7 +21,6 @@
#include <apt-pkg/indexrecords.h>
#include <apt-pkg/md5.h>
#include <apt-pkg/cdrom.h>
-#include <apti18n.h>
#include <iostream>
#include <sstream>
@@ -30,6 +29,10 @@
#include <sys/types.h>
#include <fcntl.h>
#include <stdio.h>
+#include <stdlib.h>
+
+#include "indexcopy.h"
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -53,7 +56,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
bool Debug = _config->FindB("Debug::aptcdrom",false);
// Prepare the progress indicator
- unsigned long TotalSize = 0;
+ off_t TotalSize = 0;
for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)
{
struct stat Buf;
@@ -64,14 +67,14 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
TotalSize += Buf.st_size;
}
- unsigned long CurrentSize = 0;
+ off_t CurrentSize = 0;
unsigned int NotFound = 0;
unsigned int WrongSize = 0;
unsigned int Packages = 0;
for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)
{
string OrigPath = string(*I,CDROM.length());
- unsigned long FileSize = 0;
+ off_t FileSize = 0;
// Open the package file
FileFd Pkg;
@@ -164,7 +167,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
if(Progress)
Progress->Progress(Parser.Offset());
string File;
- unsigned long Size;
+ unsigned long long Size;
if (GetFile(File,Size) == false)
{
fclose(TargetFl);
@@ -219,7 +222,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
}
// Size match
- if ((unsigned)Buf.st_size != Size)
+ if ((unsigned long long)Buf.st_size != Size)
{
if (Debug == true)
clog << "Wrong Size: " << File << endl;
@@ -453,7 +456,7 @@ bool IndexCopy::GrabFirst(string Path,string &To,unsigned int Depth)
// PackageCopy::GetFile - Get the file information from the section /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool PackageCopy::GetFile(string &File,unsigned long &Size)
+bool PackageCopy::GetFile(string &File,unsigned long long &Size)
{
File = Section->FindS("Filename");
Size = Section->FindI("Size");
@@ -479,7 +482,7 @@ bool PackageCopy::RewriteEntry(FILE *Target,string File)
// SourceCopy::GetFile - Get the file information from the section /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool SourceCopy::GetFile(string &File,unsigned long &Size)
+bool SourceCopy::GetFile(string &File,unsigned long long &Size)
{
string Files = Section->FindS("Files");
if (Files.empty() == true)
@@ -502,7 +505,7 @@ bool SourceCopy::GetFile(string &File,unsigned long &Size)
return _error->Error("Error parsing file record");
// Parse the size and append the directory
- Size = atoi(sSize.c_str());
+ Size = strtoull(sSize.c_str(), NULL, 10);
File = Base + File;
return true;
}
@@ -785,7 +788,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
bool Debug = _config->FindB("Debug::aptcdrom",false);
// Prepare the progress indicator
- unsigned long TotalSize = 0;
+ off_t TotalSize = 0;
for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)
{
struct stat Buf;
@@ -796,14 +799,14 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
TotalSize += Buf.st_size;
}
- unsigned long CurrentSize = 0;
+ off_t CurrentSize = 0;
unsigned int NotFound = 0;
unsigned int WrongSize = 0;
unsigned int Packages = 0;
for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)
{
string OrigPath = string(*I,CDROM.length());
- unsigned long FileSize = 0;
+ off_t FileSize = 0;
// Open the package file
FileFd Pkg;
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 277fb561c..21294ae7e 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -14,9 +14,6 @@
#include <string>
#include <stdio.h>
-using std::string;
-using std::vector;
-
class pkgTagSection;
class FileFd;
class indexRecords;
@@ -31,20 +28,20 @@ class IndexCopy /*{{{*/
pkgTagSection *Section;
- string ChopDirs(string Path,unsigned int Depth);
- bool ReconstructPrefix(string &Prefix,string OrigPath,string CD,
- string File);
- bool ReconstructChop(unsigned long &Chop,string Dir,string File);
- void ConvertToSourceList(string CD,string &Path);
- bool GrabFirst(string Path,string &To,unsigned int Depth);
- virtual bool GetFile(string &Filename,unsigned long &Size) = 0;
- virtual bool RewriteEntry(FILE *Target,string File) = 0;
+ std::string ChopDirs(std::string Path,unsigned int Depth);
+ bool ReconstructPrefix(std::string &Prefix,std::string OrigPath,std::string CD,
+ std::string File);
+ bool ReconstructChop(unsigned long &Chop,std::string Dir,std::string File);
+ void ConvertToSourceList(std::string CD,std::string &Path);
+ bool GrabFirst(std::string Path,std::string &To,unsigned int Depth);
+ virtual bool GetFile(std::string &Filename,unsigned long long &Size) = 0;
+ virtual bool RewriteEntry(FILE *Target,std::string File) = 0;
virtual const char *GetFileName() = 0;
virtual const char *Type() = 0;
public:
- bool CopyPackages(string CDROM,string Name,vector<string> &List,
+ bool CopyPackages(std::string CDROM,std::string Name,std::vector<std::string> &List,
pkgCdromStatus *log);
virtual ~IndexCopy() {};
};
@@ -53,8 +50,8 @@ class PackageCopy : public IndexCopy /*{{{*/
{
protected:
- virtual bool GetFile(string &Filename,unsigned long &Size);
- virtual bool RewriteEntry(FILE *Target,string File);
+ virtual bool GetFile(std::string &Filename,unsigned long long &Size);
+ virtual bool RewriteEntry(FILE *Target,std::string File);
virtual const char *GetFileName() {return "Packages";};
virtual const char *Type() {return "Package";};
@@ -64,8 +61,8 @@ class SourceCopy : public IndexCopy /*{{{*/
{
protected:
- virtual bool GetFile(string &Filename,unsigned long &Size);
- virtual bool RewriteEntry(FILE *Target,string File);
+ virtual bool GetFile(std::string &Filename,unsigned long long &Size);
+ virtual bool RewriteEntry(FILE *Target,std::string File);
virtual const char *GetFileName() {return "Sources";};
virtual const char *Type() {return "Source";};
@@ -77,7 +74,7 @@ class TranslationsCopy /*{{{*/
pkgTagSection *Section;
public:
- bool CopyTranslations(string CDROM,string Name,vector<string> &List,
+ bool CopyTranslations(std::string CDROM,std::string Name,std::vector<std::string> &List,
pkgCdromStatus *log);
};
/*}}}*/
@@ -86,13 +83,13 @@ class SigVerify /*{{{*/
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
- bool Verify(string prefix,string file, indexRecords *records);
- bool CopyMetaIndex(string CDROM, string CDName,
- string prefix, string file);
+ bool Verify(std::string prefix,std::string file, indexRecords *records);
+ bool CopyMetaIndex(std::string CDROM, std::string CDName,
+ std::string prefix, std::string file);
public:
- bool CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
- vector<string> PkgList,vector<string> SrcList);
+ bool CopyAndVerify(std::string CDROM,std::string Name,std::vector<std::string> &SigList,
+ std::vector<std::string> PkgList,std::vector<std::string> SrcList);
/** \brief generates and run the command to verify a file with gpgv */
static bool RunGPGV(std::string const &File, std::string const &FileOut,
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index f18ddbfaa..642a750d4 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -8,6 +8,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/indexfile.h>
#include <apt-pkg/error.h>
#include <apt-pkg/aptconfiguration.h>
@@ -45,9 +47,9 @@ pkgIndexFile::Type *pkgIndexFile::Type::GetType(const char *Type)
// IndexFile::ArchiveInfo - Stub /*{{{*/
// ---------------------------------------------------------------------
/* */
-string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator Ver) const
+std::string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator Ver) const
{
- return string();
+ return std::string();
}
/*}}}*/
// IndexFile::FindInCache - Stub /*{{{*/
@@ -61,10 +63,10 @@ pkgCache::PkgFileIterator pkgIndexFile::FindInCache(pkgCache &Cache) const
// IndexFile::SourceIndex - Stub /*{{{*/
// ---------------------------------------------------------------------
/* */
-string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record,
+std::string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record,
pkgSrcRecords::File const &File) const
{
- return string();
+ return std::string();
}
/*}}}*/
// IndexFile::TranslationsAvailable - Check if will use Translation /*{{{*/
@@ -96,7 +98,7 @@ __attribute__ ((deprecated)) bool pkgIndexFile::CheckLanguageCode(const char *La
/* As we have now possibly more than one LanguageCode this method is
supersided by a) private classmembers or b) getLanguages().
TODO: Remove method with next API break */
-__attribute__ ((deprecated)) string pkgIndexFile::LanguageCode() {
+__attribute__ ((deprecated)) std::string pkgIndexFile::LanguageCode() {
if (TranslationsAvailable() == false)
return "";
return APT::Configuration::getLanguages()[0];
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 2b5ae6342..5e162a846 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -27,12 +27,12 @@
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/srcrecords.h>
#include <apt-pkg/pkgrecords.h>
-
-using std::string;
+#include <apt-pkg/macros.h>
class pkgAcquire;
class pkgCacheGenerator;
class OpProgress;
+
class pkgIndexFile
{
protected:
@@ -59,13 +59,13 @@ class pkgIndexFile
virtual const Type *GetType() const = 0;
// Return descriptive strings of various sorts
- virtual string ArchiveInfo(pkgCache::VerIterator Ver) const;
- virtual string SourceInfo(pkgSrcRecords::Parser const &Record,
+ virtual std::string ArchiveInfo(pkgCache::VerIterator Ver) const;
+ virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record,
pkgSrcRecords::File const &File) const;
- virtual string Describe(bool Short = false) const = 0;
+ virtual std::string Describe(bool Short = false) const = 0;
// Interface for acquire
- virtual string ArchiveURI(string /*File*/) const {return string();};
+ virtual std::string ArchiveURI(std::string /*File*/) const {return std::string();};
// Interface for the record parsers
virtual pkgSrcRecords::Parser *CreateSrcParser() const {return 0;};
@@ -84,7 +84,7 @@ class pkgIndexFile
static bool TranslationsAvailable();
static bool CheckLanguageCode(const char *Lang);
- static string LanguageCode();
+ static std::string LanguageCode();
bool IsTrusted() const { return Trusted; };
diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index ba5b7c846..cdb9250e8 100644
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -3,16 +3,24 @@
// $Id: indexrecords.cc,v 1.1.2.4 2003/12/30 02:11:43 mdz Exp $
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/indexrecords.h>
#include <apt-pkg/tagfile.h>
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/configuration.h>
-#include <apti18n.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/hashes.h>
+
#include <sys/stat.h>
#include <clocale>
+#include <apti18n.h>
/*}}}*/
+
+using std::string;
+
string indexRecords::GetDist() const
{
return this->Dist;
@@ -78,7 +86,7 @@ bool indexRecords::Load(const string Filename) /*{{{*/
string Name;
string Hash;
- size_t Size;
+ unsigned long long Size;
while (Start < End)
{
if (!parseSumData(Start, End, Name, Hash, Size))
@@ -144,7 +152,7 @@ bool indexRecords::Load(const string Filename) /*{{{*/
return true;
}
/*}}}*/
-vector<string> indexRecords::MetaKeys() /*{{{*/
+std::vector<string> indexRecords::MetaKeys() /*{{{*/
{
std::vector<std::string> keys;
std::map<string,checkSum *>::iterator I = Entries.begin();
@@ -156,7 +164,7 @@ vector<string> indexRecords::MetaKeys() /*{{{*/
}
/*}}}*/
bool indexRecords::parseSumData(const char *&Start, const char *End, /*{{{*/
- string &Name, string &Hash, size_t &Size)
+ string &Name, string &Hash, unsigned long long &Size)
{
Name = "";
Hash = "";
@@ -193,7 +201,7 @@ bool indexRecords::parseSumData(const char *&Start, const char *End, /*{{{*/
if (EntryEnd == End)
return false;
- Size = strtol (Start, NULL, 10);
+ Size = strtoull (Start, NULL, 10);
/* Skip over intermediate blanks */
Start = EntryEnd;
diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 5b532c1a5..fa60a0847 100644
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -7,7 +7,6 @@
#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/fileutl.h>
#include <apt-pkg/hashes.h>
#include <map>
@@ -16,44 +15,44 @@
class indexRecords
{
- bool parseSumData(const char *&Start, const char *End, string &Name,
- string &Hash, size_t &Size);
+ bool parseSumData(const char *&Start, const char *End, std::string &Name,
+ std::string &Hash, unsigned long long &Size);
public:
struct checkSum;
- string ErrorText;
+ std::string ErrorText;
protected:
- string Dist;
- string Suite;
- string ExpectedDist;
+ std::string Dist;
+ std::string Suite;
+ std::string ExpectedDist;
time_t ValidUntil;
- std::map<string,checkSum *> Entries;
+ std::map<std::string,checkSum *> Entries;
public:
indexRecords();
- indexRecords(const string ExpectedDist);
+ indexRecords(const std::string ExpectedDist);
// Lookup function
- virtual const checkSum *Lookup(const string MetaKey);
+ virtual const checkSum *Lookup(const std::string MetaKey);
/** \brief tests if a checksum for this file is available */
- bool Exists(string const &MetaKey) const;
+ bool Exists(std::string const &MetaKey) const;
std::vector<std::string> MetaKeys();
- virtual bool Load(string Filename);
- string GetDist() const;
+ virtual bool Load(std::string Filename);
+ std::string GetDist() const;
time_t GetValidUntil() const;
- virtual bool CheckDist(const string MaybeDist) const;
- string GetExpectedDist() const;
+ virtual bool CheckDist(const std::string MaybeDist) const;
+ std::string GetExpectedDist() const;
virtual ~indexRecords(){};
};
struct indexRecords::checkSum
{
- string MetaKeyFilename;
+ std::string MetaKeyFilename;
HashString Hash;
- size_t Size;
+ unsigned long long Size;
};
#endif
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 4f3101687..a1c47c030 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -8,14 +8,18 @@
##################################################################### */
/*}}}*/
// Include files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/init.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/error.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/configuration.h>
-#include <apti18n.h>
-#include <config.h>
#include <cstdlib>
#include <sys/stat.h>
+
+#include <apti18n.h>
/*}}}*/
#define Stringfy_(x) # x
@@ -82,16 +86,12 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.CndSet("Dir::Log::Terminal","term.log");
Cnf.CndSet("Dir::Log::History","history.log");
- if (Cnf.Exists("Dir::Ignore-Files-Silently") == false)
- {
- Cnf.Set("Dir::Ignore-Files-Silently::", "~$");
- Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
- Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
- Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
- // ubuntu specific
- Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$");
- Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
- }
+ Cnf.Set("Dir::Ignore-Files-Silently::", "~$");
+ Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
+ Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
+ Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
+ Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
+ Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$");
// Default cdrom mount point
Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/");
@@ -109,14 +109,14 @@ bool pkgInitConfig(Configuration &Cnf)
}
// Read the configuration parts dir
- string Parts = Cnf.FindDir("Dir::Etc::parts");
+ std::string Parts = Cnf.FindDir("Dir::Etc::parts");
if (DirectoryExists(Parts) == true)
Res &= ReadConfigDir(Cnf,Parts);
else
_error->WarningE("DirectoryExists",_("Unable to read %s"),Parts.c_str());
// Read the main config file
- string FName = Cnf.FindFile("Dir::Etc::main");
+ std::string FName = Cnf.FindFile("Dir::Etc::main");
if (RealFileExists(FName) == true)
Res &= ReadConfigFile(Cnf,FName);
@@ -143,7 +143,7 @@ bool pkgInitConfig(Configuration &Cnf)
bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys)
{
Sys = 0;
- string Label = Cnf.Find("Apt::System","");
+ std::string Label = Cnf.Find("Apt::System","");
if (Label.empty() == false)
{
Sys = pkgSystem::GetSystem(Label.c_str());
diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index 6b92dd200..0c1c7ae5a 100644
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -13,8 +13,8 @@
#ifndef PKGLIB_INIT_H
#define PKGLIB_INIT_H
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/pkgsystem.h>
+class pkgSystem;
+class Configuration;
// These lines are extracted by the makefiles and the buildsystem
// Increasing MAJOR or MINOR results in the need of recompiling all
@@ -22,7 +22,7 @@
// Non-ABI-Breaks should only increase RELEASE number.
// See also buildlib/libversion.mak
#define APT_PKG_MAJOR 4
-#define APT_PKG_MINOR 11
+#define APT_PKG_MINOR 12
#define APT_PKG_RELEASE 0
extern const char *pkgVersion;
@@ -31,15 +31,4 @@ extern const char *pkgLibVersion;
bool pkgInitConfig(Configuration &Cnf);
bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys);
-#ifdef APT_COMPATIBILITY
-#if APT_COMPATIBILITY != 986
-#warning "Using APT_COMPATIBILITY"
-#endif
-
-inline bool pkgInitialize(Configuration &Cnf)
-{
- return pkgInitConfig(Cnf) && pkgInitSystem(Cnf,_system);
-};
-#endif
-
#endif
diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index f60235a5d..9cc79a7a6 100644
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -4,12 +4,7 @@
#include <string>
#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/indexfile.h>
-#include <apt-pkg/vendor.h>
-
-using std::string;
class pkgAcquire;
class pkgCacheGenerator;
@@ -18,35 +13,35 @@ class OpProgress;
class metaIndex
{
protected:
- vector <pkgIndexFile *> *Indexes;
+ std::vector <pkgIndexFile *> *Indexes;
const char *Type;
- string URI;
- string Dist;
+ std::string URI;
+ std::string Dist;
bool Trusted;
public:
// Various accessors
- virtual string GetURI() const {return URI;}
- virtual string GetDist() const {return Dist;}
+ virtual std::string GetURI() const {return URI;}
+ virtual std::string GetDist() const {return Dist;}
virtual const char* GetType() const {return Type;}
// Interface for acquire
- virtual string ArchiveURI(string const& /*File*/) const = 0;
+ virtual std::string ArchiveURI(std::string const& /*File*/) const = 0;
virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const = 0;
- virtual vector<pkgIndexFile *> *GetIndexFiles() = 0;
+ virtual std::vector<pkgIndexFile *> *GetIndexFiles() = 0;
virtual bool IsTrusted() const = 0;
- metaIndex(string const &URI, string const &Dist, char const * const Type) :
+ metaIndex(std::string const &URI, std::string const &Dist, char const * const Type) :
Indexes(NULL), Type(Type), URI(URI), Dist(Dist) {
}
virtual ~metaIndex() {
if (Indexes == 0)
return;
- for (vector<pkgIndexFile *>::iterator I = (*Indexes).begin(); I != (*Indexes).end(); ++I)
+ for (std::vector<pkgIndexFile *>::iterator I = (*Indexes).begin(); I != (*Indexes).end(); ++I)
delete *I;
delete Indexes;
}
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index a58efa987..0ac9a83e3 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -63,6 +63,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/orderlist.h>
#include <apt-pkg/depcache.h>
#include <apt-pkg/error.h>
@@ -152,7 +154,7 @@ bool pkgOrderList::DoRun()
iterator OldEnd = End;
End = NList;
for (iterator I = List; I != OldEnd; ++I)
- if (VisitNode(PkgIterator(Cache,*I)) == false)
+ if (VisitNode(PkgIterator(Cache,*I), "DoRun") == false)
{
End = OldEnd;
return false;
@@ -495,33 +497,69 @@ bool pkgOrderList::VisitRProvides(DepFunc F,VerIterator Ver)
/*}}}*/
// OrderList::VisitProvides - Visit all of the providing packages /*{{{*/
// ---------------------------------------------------------------------
-/* This routine calls visit on all providing packages. */
+/* This routine calls visit on all providing packages.
+
+ If the dependency is negative it first visits packages which are
+ intended to be removed and after that all other packages.
+ It does so to avoid situations in which this package is used to
+ satisfy a (or-group/provides) dependency of another package which
+ could have been satisfied also by upgrading another package -
+ otherwise we have more broken packages dpkg needs to auto-
+ deconfigure and in very complicated situations it even decides
+ against it! */
bool pkgOrderList::VisitProvides(DepIterator D,bool Critical)
-{
+{
SPtrArray<Version *> List = D.AllTargets();
- for (Version **I = List; *I != 0; I++)
+ for (Version **I = List; *I != 0; ++I)
{
VerIterator Ver(Cache,*I);
PkgIterator Pkg = Ver.ParentPkg();
+ if (D.IsNegative() == true && Cache[Pkg].Delete() == false)
+ continue;
+
if (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing)
continue;
-
+
if (D.IsNegative() == false &&
Cache[Pkg].InstallVer != *I)
continue;
-
+
if (D.IsNegative() == true &&
(Version *)Pkg.CurrentVer() != *I)
continue;
-
+
// Skip over missing files
if (Critical == false && IsMissing(D.ParentPkg()) == true)
continue;
- if (VisitNode(Pkg) == false)
+ if (VisitNode(Pkg, "Provides-1") == false)
return false;
}
+ if (D.IsNegative() == false)
+ return true;
+ for (Version **I = List; *I != 0; ++I)
+ {
+ VerIterator Ver(Cache,*I);
+ PkgIterator Pkg = Ver.ParentPkg();
+
+ if (Cache[Pkg].Delete() == true)
+ continue;
+
+ if (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing)
+ continue;
+
+ if ((Version *)Pkg.CurrentVer() != *I)
+ continue;
+
+ // Skip over missing files
+ if (Critical == false && IsMissing(D.ParentPkg()) == true)
+ continue;
+
+ if (VisitNode(Pkg, "Provides-2") == false)
+ return false;
+ }
+
return true;
}
/*}}}*/
@@ -530,7 +568,7 @@ bool pkgOrderList::VisitProvides(DepIterator D,bool Critical)
/* This is the core ordering routine. It calls the set dependency
consideration functions which then potentialy call this again. Finite
depth is achived through the colouring mechinism. */
-bool pkgOrderList::VisitNode(PkgIterator Pkg)
+bool pkgOrderList::VisitNode(PkgIterator Pkg, char const* from)
{
// Looping or irrelevent.
// This should probably trancend not installed packages
@@ -541,7 +579,7 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg)
if (Debug == true)
{
for (int j = 0; j != Depth; j++) clog << ' ';
- clog << "Visit " << Pkg.FullName() << endl;
+ clog << "Visit " << Pkg.FullName() << " from " << from << endl;
}
Depth++;
@@ -636,7 +674,7 @@ bool pkgOrderList::DepUnPackCrit(DepIterator D)
if (CheckDep(D) == true)
continue;
- if (VisitNode(D.ParentPkg()) == false)
+ if (VisitNode(D.ParentPkg(), "UnPackCrit") == false)
return false;
}
else
@@ -811,7 +849,7 @@ bool pkgOrderList::DepUnPackDep(DepIterator D)
if (IsMissing(D.ParentPkg()) == true)
continue;
- if (VisitNode(D.ParentPkg()) == false)
+ if (VisitNode(D.ParentPkg(), "UnPackDep-Parent") == false)
return false;
}
else
@@ -825,7 +863,7 @@ bool pkgOrderList::DepUnPackDep(DepIterator D)
if (CheckDep(D) == true)
continue;
- if (VisitNode(D.TargetPkg()) == false)
+ if (VisitNode(D.TargetPkg(), "UnPackDep-Target") == false)
return false;
}
}
@@ -924,7 +962,7 @@ bool pkgOrderList::DepRemove(DepIterator D)
if (IsFlag(P, InList) == true &&
IsFlag(P, AddPending) == false &&
Cache[P].InstallVer != 0 &&
- VisitNode(P) == true)
+ VisitNode(P, "Remove-P") == true)
{
Flag(P, Immediate);
tryFixDeps = false;
@@ -960,7 +998,7 @@ bool pkgOrderList::DepRemove(DepIterator D)
if (IsFlag(F.TargetPkg(), InList) == true &&
IsFlag(F.TargetPkg(), AddPending) == false &&
Cache[F.TargetPkg()].InstallVer != 0 &&
- VisitNode(F.TargetPkg()) == true)
+ VisitNode(F.TargetPkg(), "Remove-Target") == true)
{
Flag(F.TargetPkg(), Immediate);
tryFixDeps = false;
@@ -974,7 +1012,7 @@ bool pkgOrderList::DepRemove(DepIterator D)
if (IsFlag(Prv.OwnerPkg(), InList) == true &&
IsFlag(Prv.OwnerPkg(), AddPending) == false &&
Cache[Prv.OwnerPkg()].InstallVer != 0 &&
- VisitNode(Prv.OwnerPkg()) == true)
+ VisitNode(Prv.OwnerPkg(), "Remove-Owner") == true)
{
Flag(Prv.OwnerPkg(), Immediate);
tryFixDeps = false;
@@ -994,7 +1032,7 @@ bool pkgOrderList::DepRemove(DepIterator D)
if (IsMissing(D.ParentPkg()) == true)
continue;
- if (VisitNode(D.ParentPkg()) == false)
+ if (VisitNode(D.ParentPkg(), "Remove-Parent") == false)
return false;
}
@@ -1021,8 +1059,10 @@ bool pkgOrderList::AddLoop(DepIterator D)
Loops[LoopCount++] = D;
// Mark the packages as being part of a loop.
- Flag(D.TargetPkg(),Loop);
- Flag(D.ParentPkg(),Loop);
+ //Flag(D.TargetPkg(),Loop);
+ //Flag(D.ParentPkg(),Loop);
+ /* This is currently disabled because the Loop flag is being used for
+ loop management in the package manager. Check the orderlist.h file for more info */
return true;
}
/*}}}*/
@@ -1073,7 +1113,7 @@ bool pkgOrderList::CheckDep(DepIterator D)
just needs one */
if (D.IsNegative() == false)
{
- // ignore provides by older versions of this package
+ // ignore provides by older versions of this package
if (((D.Reverse() == false && Pkg == D.ParentPkg()) ||
(D.Reverse() == true && Pkg == D.TargetPkg())) &&
Cache[Pkg].InstallVer != *I)
diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h
index bbceb3879..a2d7b321b 100644
--- a/apt-pkg/orderlist.h
+++ b/apt-pkg/orderlist.h
@@ -18,6 +18,7 @@
#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/macros.h>
class pkgDepCache;
class pkgOrderList : protected pkgCache::Namespace
@@ -37,7 +38,7 @@ class pkgOrderList : protected pkgCache::Namespace
Package **End;
Package **List;
Package **AfterEnd;
- string *FileList;
+ std::string *FileList;
DepIterator Loops[20];
int LoopCount;
int Depth;
@@ -45,7 +46,8 @@ class pkgOrderList : protected pkgCache::Namespace
bool Debug;
// Main visit function
- bool VisitNode(PkgIterator Pkg);
+ __deprecated bool VisitNode(PkgIterator Pkg) { return VisitNode(Pkg, "UNKNOWN"); };
+ bool VisitNode(PkgIterator Pkg, char const* from);
bool VisitDeps(DepFunc F,PkgIterator Pkg);
bool VisitRDeps(DepFunc F,PkgIterator Pkg);
bool VisitRProvides(DepFunc F,VerIterator Ver);
@@ -74,7 +76,12 @@ class pkgOrderList : protected pkgCache::Namespace
typedef Package **iterator;
- // State flags
+ /* State flags
+ The Loop flag can be set on a package that is currently being processed by either SmartConfigure or
+ SmartUnPack. This allows the package manager to tell when a loop has been formed as it will try to
+ SmartUnPack or SmartConfigure a package with the Loop flag set. It will then either stop (as it knows
+ that the operation is unnecessary as its already in process), or in the case of the conflicts resolution
+ in SmartUnPack, use EarlyRemove to resolve the situation. */
enum Flags {Added = (1 << 0), AddPending = (1 << 1),
Immediate = (1 << 2), Loop = (1 << 3),
UnPacked = (1 << 4), Configured = (1 << 5),
@@ -89,10 +96,13 @@ class pkgOrderList : protected pkgCache::Namespace
void Flag(PkgIterator Pkg,unsigned long State, unsigned long F) {Flags[Pkg->ID] = (Flags[Pkg->ID] & (~F)) | State;};
inline void Flag(PkgIterator Pkg,unsigned long F) {Flags[Pkg->ID] |= F;};
inline void Flag(Package *Pkg,unsigned long F) {Flags[Pkg->ID] |= F;};
+ // RmFlag removes a flag from a package
+ inline void RmFlag(Package *Pkg,unsigned long F) {Flags[Pkg->ID] &= ~F;};
+ // IsNow will return true if the Pkg has been not been either configured or unpacked
inline bool IsNow(PkgIterator Pkg) {return (Flags[Pkg->ID] & (States & (~Removed))) == 0;};
bool IsMissing(PkgIterator Pkg);
void WipeFlags(unsigned long F);
- void SetFileList(string *FileList) {this->FileList = FileList;};
+ void SetFileList(std::string *FileList) {this->FileList = FileList;};
// Accessors
inline iterator begin() {return List;};
@@ -105,7 +115,7 @@ class pkgOrderList : protected pkgCache::Namespace
// Ordering modes
bool OrderCritical();
- bool OrderUnpack(string *FileList = 0);
+ bool OrderUnpack(std::string *FileList = 0);
bool OrderConfigure();
int Score(PkgIterator Pkg);
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index c6815658b..4f9762701 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -13,6 +13,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/packagemanager.h>
#include <apt-pkg/orderlist.h>
#include <apt-pkg/depcache.h>
@@ -22,13 +24,15 @@
#include <apt-pkg/algorithms.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/sptr.h>
-
-#include <apti18n.h>
+
+#include <apti18n.h>
#include <iostream>
-#include <fcntl.h>
+#include <fcntl.h>
/*}}}*/
using namespace std;
+bool pkgPackageManager::SigINTStop = false;
+
// PM::PackageManager - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -166,7 +170,11 @@ bool pkgPackageManager::CreateOrderList()
delete List;
List = new pkgOrderList(&Cache);
- static bool const NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
+ NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
+ ImmConfigureAll = _config->FindB("APT::Immediate-Configure-All",false);
+
+ if (Debug && ImmConfigureAll)
+ clog << "CreateOrderList(): Adding Immediate flag for all packages because of APT::Immediate-Configure-All" << endl;
// Generate the list of affected packages and sort it
for (PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
@@ -176,19 +184,21 @@ bool pkgPackageManager::CreateOrderList()
continue;
// Mark the package and its dependends for immediate configuration
- if (((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential ||
+ if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential ||
(I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) &&
- NoImmConfigure == false)
+ NoImmConfigure == false) || ImmConfigureAll)
{
- if(Debug)
+ if(Debug && !ImmConfigureAll)
clog << "CreateOrderList(): Adding Immediate flag for " << I.Name() << endl;
List->Flag(I,pkgOrderList::Immediate);
-
- // Look for other install packages to make immediate configurea
- ImmediateAdd(I, true);
- // And again with the current version.
- ImmediateAdd(I, false);
+ if (!ImmConfigureAll) {
+ // Look for other install packages to make immediate configurea
+ ImmediateAdd(I, true);
+
+ // And again with the current version.
+ ImmediateAdd(I, false);
+ }
}
// Not interesting
@@ -256,7 +266,8 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D,
// PM::ConfigureAll - Run the all out configuration /*{{{*/
// ---------------------------------------------------------------------
/* This configures every package. It is assumed they are all unpacked and
- that the final configuration is valid. */
+ that the final configuration is valid. This is also used to catch packages
+ that have not been configured when using ImmConfigureAll */
bool pkgPackageManager::ConfigureAll()
{
pkgOrderList OList(&Cache);
@@ -277,9 +288,19 @@ bool pkgPackageManager::ConfigureAll()
for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); ++I)
{
PkgIterator Pkg(Cache,*I);
+
+ /* Check if the package has been configured, this can happen if SmartConfigure
+ calls its self */
+ if (List->IsFlag(Pkg,pkgOrderList::Configured)) continue;
- if (ConfigurePkgs == true && Configure(Pkg) == false)
+ if (ConfigurePkgs == true && SmartConfigure(Pkg, 0) == false) {
+ if (ImmConfigureAll)
+ _error->Error(_("Could not perform immediate configuration on '%s'. "
+ "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),1);
+ else
+ _error->Error("Internal error, packages left unconfigured. %s",Pkg.Name());
return false;
+ }
List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
}
@@ -289,35 +310,146 @@ bool pkgPackageManager::ConfigureAll()
/*}}}*/
// PM::SmartConfigure - Perform immediate configuration of the pkg /*{{{*/
// ---------------------------------------------------------------------
-/* This routine scheduals the configuration of the given package and all
- of it's dependents. */
-bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
+/* This function tries to put the system in a state where Pkg can be configured.
+ This involves checking each of Pkg's dependanies and unpacking and
+ configuring packages where needed.
+
+ Note on failure: This method can fail, without causing any problems.
+ This can happen when using Immediate-Configure-All, SmartUnPack may call
+ SmartConfigure, it may fail because of a complex dependancy situation, but
+ a error will only be reported if ConfigureAll fails. This is why some of the
+ messages this function reports on failure (return false;) as just warnings
+ only shown when debuging*/
+bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
{
- if (Debug == true)
- clog << "SmartConfigure " << Pkg.Name() << endl;
+ // If this is true, only check and correct and dependancies without the Loop flag
+ bool PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop);
+
+ if (Debug) {
+ VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
+ clog << OutputInDepth(Depth) << "SmartConfigure " << Pkg.Name() << " (" << InstallVer.VerStr() << ")";
+ if (PkgLoop)
+ clog << " (Only Correct Dependancies)";
+ clog << endl;
+ }
- pkgOrderList OList(&Cache);
+ VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
+
+ /* Because of the ordered list, most dependancies should be unpacked,
+ however if there is a loop (A depends on B, B depends on A) this will not
+ be the case, so check for dependancies before configuring. */
+ bool Bad = false;
+ for (DepIterator D = instVer.DependsList();
+ D.end() == false; )
+ {
+ // Compute a single dependency element (glob or)
+ pkgCache::DepIterator Start;
+ pkgCache::DepIterator End;
+ D.GlobOr(Start,End);
+
+ if (End->Type == pkgCache::Dep::Depends)
+ Bad = true;
+
+ // Check for dependanices that have not been unpacked, probably due to loops.
+ while (End->Type == pkgCache::Dep::Depends) {
+ PkgIterator DepPkg;
+ VerIterator InstallVer;
+ SPtrArray<Version *> VList = Start.AllTargets();
+
+ // Check through each version of each package that could satisfy this dependancy
+ for (Version **I = VList; *I != 0; I++) {
+ VerIterator Ver(Cache,*I);
+ DepPkg = Ver.ParentPkg();
+ InstallVer = VerIterator(Cache,Cache[DepPkg].InstallVer);
- if (DepAdd(OList,Pkg) == false)
+ // Check if the current version of the package is avalible and will satisfy this dependancy
+ if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true &&
+ !List->IsFlag(DepPkg,pkgOrderList::Removed) && DepPkg.State() == PkgIterator::NeedsNothing)
+ {
+ Bad = false;
+ break;
+ }
+
+ // Check if the version that is going to be installed will satisfy the dependancy
+ if (Cache[DepPkg].InstallVer == *I) {
+ if (List->IsFlag(DepPkg,pkgOrderList::UnPacked)) {
+ if (List->IsFlag(DepPkg,pkgOrderList::Loop) && PkgLoop) {
+ // This dependancy has already been dealt with by another SmartConfigure on Pkg
+ Bad = false;
+ break;
+ } else if (List->IsFlag(Pkg,pkgOrderList::Loop)) {
+ /* Check for a loop to prevent one forming
+ If A depends on B and B depends on A, SmartConfigure will
+ just hop between them if this is not checked. Dont remove the
+ loop flag after finishing however as loop is already set.
+ This means that there is another SmartConfigure call for this
+ package and it will remove the loop flag */
+ Bad = !SmartConfigure(DepPkg, Depth + 1);
+ } else {
+ /* Check for a loop to prevent one forming
+ If A depends on B and B depends on A, SmartConfigure will
+ just hop between them if this is not checked */
+ List->Flag(Pkg,pkgOrderList::Loop);
+ Bad = !SmartConfigure(DepPkg, Depth + 1);
+ List->RmFlag(Pkg,pkgOrderList::Loop);
+ }
+ // If SmartConfigure was succesfull, Bad is false, so break
+ if (!Bad) break;
+ } else if (List->IsFlag(DepPkg,pkgOrderList::Configured)) {
+ Bad = false;
+ break;
+ }
+ }
+ }
+
+ /* If the dependany is still not satisfied, try, if possible, unpacking a package to satisfy it */
+ if (InstallVer != 0 && Bad) {
+ if (List->IsNow(DepPkg)) {
+ Bad = false;
+ if (List->IsFlag(Pkg,pkgOrderList::Loop))
+ {
+ if (Debug)
+ std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl;
+ }
+ else
+ {
+ List->Flag(Pkg,pkgOrderList::Loop);
+ if (Debug)
+ cout << OutputInDepth(Depth) << "Unpacking " << DepPkg.Name() << " to avoid loop" << endl;
+ SmartUnPack(DepPkg, true, Depth + 1);
+ List->RmFlag(Pkg,pkgOrderList::Loop);
+ }
+ }
+ }
+
+ if (Start==End) {
+ if (Bad && Debug && List->IsFlag(DepPkg,pkgOrderList::Loop) == false)
+ std::clog << OutputInDepth(Depth) << "Could not satisfy dependancies for " << Pkg.Name() << std::endl;
+ break;
+ } else {
+ Start++;
+ }
+ }
+ }
+
+ if (Bad) {
+ if (Debug)
+ _error->Warning(_("Could not configure '%s'. "),Pkg.Name());
return false;
+ }
+
+ if (PkgLoop) return true;
static std::string const conf = _config->Find("PackageManager::Configure","all");
static bool const ConfigurePkgs = (conf == "all" || conf == "smart");
- if (ConfigurePkgs == true)
- if (OList.OrderConfigure() == false)
- return false;
+ if (List->IsFlag(Pkg,pkgOrderList::Configured))
+ return _error->Error("Internal configure error on '%s'.", Pkg.Name());
- // Perform the configuring
- for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); ++I)
- {
- PkgIterator Pkg(Cache,*I);
-
- if (ConfigurePkgs == true && Configure(Pkg) == false)
- return false;
-
- List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
- }
+ if (ConfigurePkgs == true && Configure(Pkg) == false)
+ return false;
+
+ List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
if ((Cache[Pkg].InstVerIter(Cache)->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same)
for (PkgIterator P = Pkg.Group().PackageList();
@@ -327,97 +459,16 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
(Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
continue;
- SmartConfigure(P);
+ SmartConfigure(P, (Depth +1));
}
// Sanity Check
if (List->IsFlag(Pkg,pkgOrderList::Configured) == false)
- return _error->Error(_("Could not perform immediate configuration on '%s'. "
- "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),1);
+ return _error->Error(_("Could not configure '%s'. "),Pkg.Name());
return true;
}
/*}}}*/
-// PM::DepAdd - Add all dependents to the oder list /*{{{*/
-// ---------------------------------------------------------------------
-/* This recursively adds all dependents to the order list */
-bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
-{
- if (OList.IsFlag(Pkg,pkgOrderList::Added) == true)
- return true;
- if (List->IsFlag(Pkg,pkgOrderList::Configured) == true)
- return true;
- if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == false)
- return false;
-
- if (Debug)
- std::clog << OutputInDepth(Depth) << "DepAdd: " << Pkg.Name() << std::endl;
-
- // Put the package on the list
- OList.push_back(Pkg);
- OList.Flag(Pkg,pkgOrderList::Added);
- Depth++;
-
- // Check the dependencies to see if they are all satisfied.
- bool Bad = false;
- for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList(); D.end() == false;)
- {
- if (D->Type != pkgCache::Dep::Depends && D->Type != pkgCache::Dep::PreDepends)
- {
- ++D;
- continue;
- }
-
- // Grok or groups
- Bad = true;
- for (bool LastOR = true; D.end() == false && LastOR == true; ++D)
- {
- LastOR = (D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or;
-
- if (Bad == false)
- continue;
-
- SPtrArray<Version *> VList = D.AllTargets();
- for (Version **I = VList; *I != 0 && Bad == true; ++I)
- {
- VerIterator Ver(Cache,*I);
- PkgIterator Pkg = Ver.ParentPkg();
-
- // See if the current version is ok
- if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true &&
- Pkg.State() == PkgIterator::NeedsNothing)
- {
- Bad = false;
- continue;
- }
-
- // Not the install version
- if (Cache[Pkg].InstallVer != *I ||
- (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
- continue;
-
- if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == true)
- Bad = !DepAdd(OList,Pkg,Depth);
- if (List->IsFlag(Pkg,pkgOrderList::Configured) == true)
- Bad = false;
- }
- }
-
- if (Bad == true)
- {
- if (Debug)
- std::clog << OutputInDepth(Depth) << "DepAdd FAILS on: " << Pkg.Name() << std::endl;
- OList.Flag(Pkg,0,pkgOrderList::Added);
- OList.pop_back();
- Depth--;
- return false;
- }
- }
-
- Depth--;
- return true;
-}
- /*}}}*/
// PM::EarlyRemove - Perform removal of packages before their time /*{{{*/
// ---------------------------------------------------------------------
/* This is called to deal with conflicts arising from unpacking */
@@ -483,30 +534,36 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg)
/*}}}*/
// PM::SmartUnPack - Install helper /*{{{*/
// ---------------------------------------------------------------------
-/* This performs the task of handling pre-depends. */
+/* This puts the system in a state where it can Unpack Pkg, if Pkg is allready
+ unpacked, or when it has been unpacked, if Immediate==true it configures it. */
bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
{
- return SmartUnPack(Pkg, true);
+ return SmartUnPack(Pkg, true, 0);
}
-bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
+bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int const Depth)
{
- // Check if it is already unpacked
- if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure &&
- Cache[Pkg].Keep() == true)
- {
- List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
- if (Immediate == true &&
- List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
- if (SmartConfigure(Pkg) == false)
- return _error->Error(_("Could not perform immediate configuration on already unpacked '%s'. "
- "Please see man 5 apt.conf under APT::Immediate-Configure for details."),Pkg.Name());
- return true;
+ bool PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop);
+
+ if (Debug) {
+ clog << OutputInDepth(Depth) << "SmartUnPack " << Pkg.Name();
+ VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
+ if (Pkg.CurrentVer() == 0)
+ cout << " (install version " << InstallVer.VerStr() << ")";
+ else
+ cout << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")";
+ if (PkgLoop)
+ cout << " (Only Perform PreUnpack Checks)";
+ cout << endl;
}
VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
- /* See if this packages install version has any predependencies
- that are not met by 'now' packages. */
+ /* PreUnpack Checks: This loop checks and attempts to rectify and problems that would prevent the package being unpacked.
+ It addresses: PreDepends, Conflicts, Obsoletes and Breaks (DpkgBreaks). Any resolutions that do not require it should
+ avoid configuration (calling SmartUnpack with Immediate=true), this is because when unpacking some packages with
+ complex dependancy structures, trying to configure some packages while breaking the loops can complicate things .
+ This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured),
+ or by the ConfigureAll call at the end of the for loop in OrderInstall. */
for (DepIterator D = instVer.DependsList();
D.end() == false; )
{
@@ -517,8 +574,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
while (End->Type == pkgCache::Dep::PreDepends)
{
- if (Debug == true)
- clog << "PreDepends order for " << Pkg.Name() << std::endl;
+ if (Debug)
+ clog << OutputInDepth(Depth) << "PreDepends order for " << Pkg.Name() << std::endl;
// Look for possible ok targets.
SPtrArray<Version *> VList = Start.AllTargets();
@@ -533,8 +590,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
Pkg.State() == PkgIterator::NeedsNothing)
{
Bad = false;
- if (Debug == true)
- clog << "Found ok package " << Pkg.Name() << endl;
+ if (Debug)
+ clog << OutputInDepth(Depth) << "Found ok package " << Pkg.Name() << endl;
continue;
}
}
@@ -549,10 +606,15 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
if (Cache[Pkg].InstallVer != *I ||
(Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
continue;
+
+ if (List->IsFlag(Pkg,pkgOrderList::Configured)) {
+ Bad = false;
+ continue;
+ }
- if (Debug == true)
- clog << "Trying to SmartConfigure " << Pkg.Name() << endl;
- Bad = !SmartConfigure(Pkg);
+ if (Debug)
+ clog << OutputInDepth(Depth) << "Trying to SmartConfigure " << Pkg.Name() << endl;
+ Bad = !SmartConfigure(Pkg, Depth + 1);
}
/* If this or element did not match then continue on to the
@@ -566,7 +628,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
End.TargetPkg().Name(),Pkg.Name());
++Start;
}
- else
+ else
break;
}
@@ -579,28 +641,96 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
for (Version **I = VList; *I != 0; I++)
{
VerIterator Ver(Cache,*I);
- PkgIterator Pkg = Ver.ParentPkg();
+ PkgIterator ConflictPkg = Ver.ParentPkg();
+ VerIterator InstallVer(Cache,Cache[ConflictPkg].InstallVer);
// See if the current version is conflicting
- if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true)
- {
- if (EarlyRemove(Pkg) == false)
- return _error->Error("Internal Error, Could not early remove %s",Pkg.Name());
+ if (ConflictPkg.CurrentVer() == Ver && List->IsNow(ConflictPkg))
+ {
+ cout << OutputInDepth(Depth) << Pkg.Name() << " conflicts with " << ConflictPkg.Name() << endl;
+ /* If a loop is not present or has not yet been detected, attempt to unpack packages
+ to resolve this conflict. If there is a loop present, remove packages to resolve this conflict */
+ if (!List->IsFlag(ConflictPkg,pkgOrderList::Loop)) {
+ if (Cache[ConflictPkg].Keep() == 0 && Cache[ConflictPkg].InstallVer != 0) {
+ if (Debug)
+ cout << OutputInDepth(Depth) << OutputInDepth(Depth) << "Unpacking " << ConflictPkg.Name() << " to prevent conflict" << endl;
+ List->Flag(Pkg,pkgOrderList::Loop);
+ SmartUnPack(ConflictPkg,false, Depth + 1);
+ // Remove loop to allow it to be used later if needed
+ List->RmFlag(Pkg,pkgOrderList::Loop);
+ } else {
+ if (EarlyRemove(ConflictPkg) == false)
+ return _error->Error("Internal Error, Could not early remove %s",ConflictPkg.Name());
+ }
+ } else {
+ if (!List->IsFlag(ConflictPkg,pkgOrderList::Removed)) {
+ if (Debug)
+ cout << OutputInDepth(Depth) << "Because of conficts knot, removing " << ConflictPkg.Name() << " to conflict violation" << endl;
+ if (EarlyRemove(ConflictPkg) == false)
+ return _error->Error("Internal Error, Could not early remove %s",ConflictPkg.Name());
+ }
+ }
+ }
+ }
+ }
+
+ // Check for breaks
+ if (End->Type == pkgCache::Dep::DpkgBreaks) {
+ SPtrArray<Version *> VList = End.AllTargets();
+ for (Version **I = VList; *I != 0; I++)
+ {
+ VerIterator Ver(Cache,*I);
+ PkgIterator BrokenPkg = Ver.ParentPkg();
+ VerIterator InstallVer(Cache,Cache[BrokenPkg].InstallVer);
+
+ // Check if it needs to be unpacked
+ if (List->IsFlag(BrokenPkg,pkgOrderList::InList) && Cache[BrokenPkg].Delete() == false &&
+ List->IsNow(BrokenPkg)) {
+ if (List->IsFlag(BrokenPkg,pkgOrderList::Loop) && PkgLoop) {
+ // This dependancy has already been dealt with by another SmartUnPack on Pkg
+ break;
+ } else if (List->IsFlag(Pkg,pkgOrderList::Loop)) {
+ /* Found a break, so unpack the package, but dont remove loop as already set.
+ This means that there is another SmartUnPack call for this
+ package and it will remove the loop flag. */
+ if (Debug)
+ cout << OutputInDepth(Depth) << " Unpacking " << BrokenPkg.Name() << " to avoid break" << endl;
+
+ SmartUnPack(BrokenPkg, false, Depth + 1);
+ } else {
+ List->Flag(Pkg,pkgOrderList::Loop);
+ // Found a break, so unpack the package
+ if (Debug)
+ cout << OutputInDepth(Depth) << " Unpacking " << BrokenPkg.Name() << " to avoid break" << endl;
+
+ SmartUnPack(BrokenPkg, false, Depth + 1);
+ List->RmFlag(Pkg,pkgOrderList::Loop);
+ }
+ }
+
+ // Check if a package needs to be removed
+ if (Cache[BrokenPkg].Delete() == true && !List->IsFlag(BrokenPkg,pkgOrderList::Configured)) {
+ if (Debug)
+ cout << OutputInDepth(Depth) << " Removing " << BrokenPkg.Name() << " to avoid break" << endl;
+ SmartRemove(BrokenPkg);
}
}
}
}
-
+
// Check for reverse conflicts.
if (CheckRConflicts(Pkg,Pkg.RevDependsList(),
instVer.VerStr()) == false)
- return false;
+ return false;
for (PrvIterator P = instVer.ProvidesList();
P.end() == false; ++P)
if (Pkg->Group != P.OwnerPkg()->Group)
CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion());
+ if (PkgLoop)
+ return true;
+
List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
if (Immediate == true && instVer->MultiArch == pkgCache::Version::Same)
@@ -619,7 +749,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
(Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
continue;
- if (SmartUnPack(P, false) == false)
+ if (SmartUnPack(P, false, Depth + 1) == false)
return false;
}
if (installed == false && Install(Pkg,FileNames[Pkg->ID]) == false)
@@ -631,19 +761,20 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
(Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
continue;
- if (SmartUnPack(P, false) == false)
+ if (SmartUnPack(P, false, Depth + 1) == false)
return false;
}
}
- else if (Install(Pkg,FileNames[Pkg->ID]) == false)
+ // packages which are already unpacked don't need to be unpacked again
+ else if (Pkg.State() != pkgCache::PkgIterator::NeedsConfigure && Install(Pkg,FileNames[Pkg->ID]) == false)
return false;
- // Perform immedate configuration of the package.
- if (Immediate == true &&
- List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
- if (SmartConfigure(Pkg) == false)
- return _error->Error(_("Could not perform immediate configuration on '%s'. "
- "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),2);
+ if (Immediate == true) {
+ // Perform immedate configuration of the package.
+ if (SmartConfigure(Pkg, Depth + 1) == false)
+ _error->Warning(_("Could not perform immediate configuration on '%s'. "
+ "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),2);
+ }
return true;
}
@@ -677,12 +808,19 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
for (pkgOrderList::iterator I = List->begin(); I != List->end(); ++I)
{
PkgIterator Pkg(Cache,*I);
-
+
if (List->IsNow(Pkg) == false)
{
- if (Debug == true)
- clog << "Skipping already done " << Pkg.Name() << endl;
+ if (!List->IsFlag(Pkg,pkgOrderList::Configured) && !NoImmConfigure) {
+ if (SmartConfigure(Pkg, 0) == false && Debug)
+ _error->Warning("Internal Error, Could not configure %s",Pkg.Name());
+ // FIXME: The above warning message might need changing
+ } else {
+ if (Debug == true)
+ clog << "Skipping already done " << Pkg.Name() << endl;
+ }
continue;
+
}
if (List->IsMissing(Pkg) == true)
@@ -713,9 +851,16 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
return Failed;
}
else
- if (SmartUnPack(Pkg) == false)
+ if (SmartUnPack(Pkg,List->IsFlag(Pkg,pkgOrderList::Immediate),0) == false)
return Failed;
DoneSomething = true;
+
+ if (ImmConfigureAll) {
+ /* ConfigureAll here to pick up and packages left unconfigured becuase they were unpacked in the
+ "PreUnpack Checks" section */
+ if (!ConfigureAll())
+ return Failed;
+ }
}
// Final run through the configure phase
@@ -731,7 +876,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
PkgIterator(Cache,*I).Name());
return Failed;
}
- }
+ }
return Completed;
}
@@ -763,4 +908,4 @@ pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd)
return DoInstallPostFork(statusFd);
}
- /*}}}*/
+ /*}}}*/
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 053b4dc13..d4989a6e0 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -23,15 +23,12 @@
#ifndef PKGLIB_PACKAGEMANAGER_H
#define PKGLIB_PACKAGEMANAGER_H
+#include <apt-pkg/pkgcache.h>
#include <string>
#include <iostream>
-#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/depcache.h>
#include <set>
-using std::string;
-
class pkgAcquire;
class pkgDepCache;
class pkgSourceList;
@@ -42,12 +39,15 @@ class pkgPackageManager : protected pkgCache::Namespace
public:
enum OrderResult {Completed,Failed,Incomplete};
+ static bool SigINTStop;
protected:
- string *FileNames;
+ std::string *FileNames;
pkgDepCache &Cache;
pkgOrderList *List;
bool Debug;
+ bool NoImmConfigure;
+ bool ImmConfigureAll;
/** \brief saves packages dpkg let disappear
@@ -57,7 +57,6 @@ class pkgPackageManager : protected pkgCache::Namespace
*/
std::set<std::string> disappearedPkgs;
- bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0);
void ImmediateAdd(PkgIterator P, bool UseInstallVer, unsigned const int &Depth = 0);
virtual OrderResult OrderInstall();
bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);
@@ -68,15 +67,15 @@ class pkgPackageManager : protected pkgCache::Namespace
// Install helpers
bool ConfigureAll();
- bool SmartConfigure(PkgIterator Pkg);
+ bool SmartConfigure(PkgIterator Pkg, int const Depth);
//FIXME: merge on abi break
bool SmartUnPack(PkgIterator Pkg);
- bool SmartUnPack(PkgIterator Pkg, bool const Immediate);
+ bool SmartUnPack(PkgIterator Pkg, bool const Immediate, int const Depth);
bool SmartRemove(PkgIterator Pkg);
- bool EarlyRemove(PkgIterator Pkg);
+ bool EarlyRemove(PkgIterator Pkg);
// The Actual installation implementation
- virtual bool Install(PkgIterator /*Pkg*/,string /*File*/) {return false;};
+ virtual bool Install(PkgIterator /*Pkg*/,std::string /*File*/) {return false;};
virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
virtual bool Go(int statusFd=-1) {return true;};
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 75f925991..c854249e4 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -20,6 +20,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/policy.h>
#include <apt-pkg/version.h>
@@ -29,13 +31,12 @@
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/macros.h>
-#include <apti18n.h>
-
#include <string>
#include <sys/stat.h>
#include <unistd.h>
-
#include <ctype.h>
+
+#include <apti18n.h>
/*}}}*/
using std::string;
@@ -489,7 +490,7 @@ pkgCache::PkgIterator::CurVersion() const
if they provide no new information (e.g. there is no newer version than candidate)
If no version and/or section can be found "none" is used. */
std::ostream&
-operator<<(ostream& out, pkgCache::PkgIterator Pkg)
+operator<<(std::ostream& out, pkgCache::PkgIterator Pkg)
{
if (Pkg.end() == true)
return out << "invalid package";
@@ -684,7 +685,7 @@ void pkgCache::DepIterator::GlobOr(DepIterator &Start,DepIterator &End)
// ostream operator to handle string representation of a dependecy /*{{{*/
// ---------------------------------------------------------------------
/* */
-std::ostream& operator<<(ostream& out, pkgCache::DepIterator D)
+std::ostream& operator<<(std::ostream& out, pkgCache::DepIterator D)
{
if (D.end() == true)
return out << "invalid dependency";
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 87912aead..7e32a3a96 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -79,8 +79,6 @@
#include <time.h>
#include <apt-pkg/mmap.h>
-using std::string;
-
class pkgVersioningSystem;
class pkgCache /*{{{*/
{
@@ -152,10 +150,10 @@ class pkgCache /*{{{*/
protected:
// Memory mapped cache file
- string CacheFile;
+ std::string CacheFile;
MMap &Map;
- unsigned long sHash(const string &S) const;
+ unsigned long sHash(const std::string &S) const;
unsigned long sHash(const char *S) const;
public:
@@ -180,16 +178,16 @@ class pkgCache /*{{{*/
inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();};
// String hashing function (512 range)
- inline unsigned long Hash(const string &S) const {return sHash(S);};
+ inline unsigned long Hash(const std::string &S) const {return sHash(S);};
inline unsigned long Hash(const char *S) const {return sHash(S);};
// Useful transformation things
const char *Priority(unsigned char Priority);
// Accessors
- GrpIterator FindGrp(const string &Name);
- PkgIterator FindPkg(const string &Name);
- PkgIterator FindPkg(const string &Name, const string &Arch);
+ GrpIterator FindGrp(const std::string &Name);
+ PkgIterator FindPkg(const std::string &Name);
+ PkgIterator FindPkg(const std::string &Name, const std::string &Arch);
Header &Head() {return *HeaderP;};
inline GrpIterator GrpBegin();
@@ -214,7 +212,7 @@ class pkgCache /*{{{*/
private:
bool MultiArchEnabled;
- PkgIterator SingleArchFindPkg(const string &Name);
+ PkgIterator SingleArchFindPkg(const std::string &Name);
inline char const * const NativeArch() const;
};
/*}}}*/
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 870930c72..9f999c41b 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -10,7 +10,7 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#define APT_COMPATIBILITY 986
+#include <config.h>
#include <apt-pkg/pkgcachegen.h>
#include <apt-pkg/error.h>
@@ -23,17 +23,17 @@
#include <apt-pkg/sptr.h>
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/macros.h>
-
#include <apt-pkg/tagfile.h>
-
-#include <apti18n.h>
+#include <apt-pkg/metaindex.h>
+#include <apt-pkg/fileutl.h>
#include <vector>
-
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
#include <stdio.h>
+
+#include <apti18n.h>
/*}}}*/
typedef vector<pkgIndexFile *>::iterator FileIterator;
template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap;
@@ -392,6 +392,31 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
return _error->Error(_("Error occurred while processing %s (%s%d)"),
Pkg.Name(), "NewFileVer", 2);
+ pkgCache::GrpIterator Grp = Pkg.Group();
+ Dynamic<pkgCache::GrpIterator> DynGrp(Grp);
+
+ /* If it is the first version of this package we need to add implicit
+ Multi-Arch dependencies to all other package versions in the group now -
+ otherwise we just add them for this new version */
+ if (Pkg.VersionList()->NextVer == 0)
+ {
+ pkgCache::PkgIterator P = Grp.PackageList();
+ Dynamic<pkgCache::PkgIterator> DynP(P);
+ for (; P.end() != true; P = Grp.NextPkg(P))
+ {
+ if (P->ID == Pkg->ID)
+ continue;
+ pkgCache::VerIterator V = P.VersionList();
+ Dynamic<pkgCache::VerIterator> DynV(V);
+ for (; V.end() != true; ++V)
+ if (unlikely(AddImplicitDepends(V, Pkg) == false))
+ return _error->Error(_("Error occurred while processing %s (%s%d)"),
+ Pkg.Name(), "AddImplicitDepends", 1);
+ }
+ }
+ if (unlikely(AddImplicitDepends(Grp, Pkg, Ver) == false))
+ return _error->Error(_("Error occurred while processing %s (%s%d)"),
+ Pkg.Name(), "AddImplicitDepends", 2);
// Read only a single record and return
if (OutVer != 0)
@@ -409,7 +434,6 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
/* Before we add a new description we first search in the group for
a version with a description of the same MD5 - if so we reuse this
description group instead of creating our own for this version */
- pkgCache::GrpIterator Grp = Pkg.Group();
for (pkgCache::PkgIterator P = Grp.PackageList();
P.end() == false; P = Grp.NextPkg(P))
{
@@ -574,6 +598,75 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name
return true;
}
/*}}}*/
+// CacheGenerator::AddImplicitDepends /*{{{*/
+bool pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator &G,
+ pkgCache::PkgIterator &P,
+ pkgCache::VerIterator &V)
+{
+ // copy P.Arch() into a string here as a cache remap
+ // in NewDepends() later may alter the pointer location
+ string Arch = P.Arch() == NULL ? "" : P.Arch();
+ map_ptrloc *OldDepLast = NULL;
+ /* MultiArch handling introduces a lot of implicit Dependencies:
+ - MultiArch: same → Co-Installable if they have the same version
+ - All others conflict with all other group members */
+ bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
+ pkgCache::PkgIterator D = G.PackageList();
+ Dynamic<pkgCache::PkgIterator> DynD(D);
+ for (; D.end() != true; D = G.NextPkg(D))
+ {
+ if (Arch == D.Arch() || D->VersionList == 0)
+ continue;
+ /* We allow only one installed arch at the time
+ per group, therefore each group member conflicts
+ with all other group members */
+ if (coInstall == true)
+ {
+ // Replaces: ${self}:other ( << ${binary:Version})
+ NewDepends(D, V, V.VerStr(),
+ pkgCache::Dep::Less, pkgCache::Dep::Replaces,
+ OldDepLast);
+ // Breaks: ${self}:other (!= ${binary:Version})
+ NewDepends(D, V, V.VerStr(),
+ pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks,
+ OldDepLast);
+ } else {
+ // Conflicts: ${self}:other
+ NewDepends(D, V, "",
+ pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts,
+ OldDepLast);
+ }
+ }
+ return true;
+}
+bool pkgCacheGenerator::AddImplicitDepends(pkgCache::VerIterator &V,
+ pkgCache::PkgIterator &D)
+{
+ /* MultiArch handling introduces a lot of implicit Dependencies:
+ - MultiArch: same → Co-Installable if they have the same version
+ - All others conflict with all other group members */
+ map_ptrloc *OldDepLast = NULL;
+ bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
+ if (coInstall == true)
+ {
+ // Replaces: ${self}:other ( << ${binary:Version})
+ NewDepends(D, V, V.VerStr(),
+ pkgCache::Dep::Less, pkgCache::Dep::Replaces,
+ OldDepLast);
+ // Breaks: ${self}:other (!= ${binary:Version})
+ NewDepends(D, V, V.VerStr(),
+ pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks,
+ OldDepLast);
+ } else {
+ // Conflicts: ${self}:other
+ NewDepends(D, V, "",
+ pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts,
+ OldDepLast);
+ }
+ return true;
+}
+
+ /*}}}*/
// CacheGenerator::NewFileVer - Create a new File<->Version association /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -692,76 +785,6 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,
return Description;
}
/*}}}*/
-// CacheGenerator::FinishCache - do various finish operations /*{{{*/
-// ---------------------------------------------------------------------
-/* This prepares the Cache for delivery */
-bool pkgCacheGenerator::FinishCache(OpProgress *Progress)
-{
- // FIXME: add progress reporting for this operation
- // Do we have different architectures in your groups ?
- vector<string> archs = APT::Configuration::getArchitectures();
- if (archs.size() > 1)
- {
- // Create Conflicts in between the group
- pkgCache::GrpIterator G = GetCache().GrpBegin();
- Dynamic<pkgCache::GrpIterator> DynG(G);
- for (; G.end() != true; ++G)
- {
- string const PkgName = G.Name();
- pkgCache::PkgIterator P = G.PackageList();
- Dynamic<pkgCache::PkgIterator> DynP(P);
- for (; P.end() != true; P = G.NextPkg(P))
- {
- pkgCache::PkgIterator allPkg;
- Dynamic<pkgCache::PkgIterator> DynallPkg(allPkg);
- pkgCache::VerIterator V = P.VersionList();
- Dynamic<pkgCache::VerIterator> DynV(V);
- for (; V.end() != true; ++V)
- {
- // copy P.Arch() into a string here as a cache remap
- // in NewDepends() later may alter the pointer location
- string Arch = P.Arch() == NULL ? "" : P.Arch();
- map_ptrloc *OldDepLast = NULL;
- /* MultiArch handling introduces a lot of implicit Dependencies:
- - MultiArch: same → Co-Installable if they have the same version
- - Architecture: all → Need to be Co-Installable for internal reasons
- - All others conflict with all other group members */
- bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
- for (vector<string>::const_iterator A = archs.begin(); A != archs.end(); ++A)
- {
- if (*A == Arch)
- continue;
- /* We allow only one installed arch at the time
- per group, therefore each group member conflicts
- with all other group members */
- pkgCache::PkgIterator D = G.FindPkg(*A);
- Dynamic<pkgCache::PkgIterator> DynD(D);
- if (D.end() == true)
- continue;
- if (coInstall == true)
- {
- // Replaces: ${self}:other ( << ${binary:Version})
- NewDepends(D, V, V.VerStr(),
- pkgCache::Dep::Less, pkgCache::Dep::Replaces,
- OldDepLast);
- // Breaks: ${self}:other (!= ${binary:Version})
- NewDepends(D, V, V.VerStr(),
- pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks,
- OldDepLast);
- } else {
- // Conflicts: ${self}:other
- NewDepends(D, V, "",
- pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts,
- OldDepLast);
- }
- }
- }
- }
- }
- }
- return true;
-}
- /*}}}*/
// CacheGenerator::NewDepends - Create a dependency element /*{{{*/
// ---------------------------------------------------------------------
/* This creates a dependency element in the tree. It is linked to the
@@ -1324,9 +1347,6 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
Files.begin()+EndOfSource,Files.end()) == false)
return false;
-
- // FIXME: move me to a better place
- Gen.FinishCache(Progress);
}
else
{
@@ -1369,9 +1389,6 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
Files.begin()+EndOfSource,Files.end()) == false)
return false;
-
- // FIXME: move me to a better place
- Gen.FinishCache(Progress);
}
if (Debug == true)
std::clog << "Caches are ready for shipping" << std::endl;
@@ -1422,9 +1439,6 @@ bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **O
Files.begin()+EndOfSource,Files.end()) == false)
return false;
- // FIXME: move me to a better place
- Gen.FinishCache(Progress);
-
if (_error->PendingError() == true)
return false;
*OutMap = Map.UnGuard();
@@ -1445,4 +1459,9 @@ bool IsDuplicateDescription(pkgCache::DescIterator Desc,
return false;
}
/*}}}*/
-
+// CacheGenerator::FinishCache /*{{{*/
+bool pkgCacheGenerator::FinishCache(OpProgress *Progress)
+{
+ return true;
+}
+ /*}}}*/
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 688eb0f11..b6259b433 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -22,6 +22,7 @@
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/md5.h>
+#include <apt-pkg/macros.h>
#include <vector>
@@ -63,29 +64,29 @@ class pkgCacheGenerator /*{{{*/
pkgCache Cache;
OpProgress *Progress;
- string PkgFileName;
+ std::string PkgFileName;
pkgCache::PackageFile *CurrentFile;
// Flag file dependencies
bool FoundFileDeps;
- bool NewGroup(pkgCache::GrpIterator &Grp,const string &Name);
- bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Name, const string &Arch);
+ bool NewGroup(pkgCache::GrpIterator &Grp,const std::string &Name);
+ bool NewPackage(pkgCache::PkgIterator &Pkg,const std::string &Name, const std::string &Arch);
bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);
bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver,
- string const &Version, unsigned int const &Op,
+ std::string const &Version, unsigned int const &Op,
unsigned int const &Type, map_ptrloc* &OldDepLast);
- unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next);
- map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lang,const MD5SumValue &md5sum,map_ptrloc Next);
+ unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,unsigned long Next);
+ map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const std::string &Lang,const MD5SumValue &md5sum,map_ptrloc Next);
public:
unsigned long WriteUniqString(const char *S,unsigned int Size);
- inline unsigned long WriteUniqString(const string &S) {return WriteUniqString(S.c_str(),S.length());};
+ inline unsigned long WriteUniqString(const std::string &S) {return WriteUniqString(S.c_str(),S.length());};
void DropProgress() {Progress = 0;};
- bool SelectFile(const string &File,const string &Site,pkgIndexFile const &Index,
+ bool SelectFile(const std::string &File,const std::string &Site,pkgIndexFile const &Index,
unsigned long Flags = 0);
bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0);
inline pkgCache &GetCache() {return Cache;};
@@ -94,7 +95,7 @@ class pkgCacheGenerator /*{{{*/
bool HasFileDeps() {return FoundFileDeps;};
bool MergeFileProvides(ListParser &List);
- bool FinishCache(OpProgress *Progress);
+ __deprecated bool FinishCache(OpProgress *Progress);
static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress,
MMap **OutMap = 0,bool AllowMem = false);
@@ -111,6 +112,10 @@ class pkgCacheGenerator /*{{{*/
bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg);
bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,
std::string const &Version, pkgCache::VerIterator* &OutVer);
+
+ bool AddImplicitDepends(pkgCache::GrpIterator &G, pkgCache::PkgIterator &P,
+ pkgCache::VerIterator &V);
+ bool AddImplicitDepends(pkgCache::VerIterator &V, pkgCache::PkgIterator &D);
};
/*}}}*/
// This is the abstract package list parser class. /*{{{*/
@@ -128,26 +133,26 @@ class pkgCacheGenerator::ListParser
protected:
- inline unsigned long WriteUniqString(string S) {return Owner->WriteUniqString(S);};
+ inline unsigned long WriteUniqString(std::string S) {return Owner->WriteUniqString(S);};
inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);};
- inline unsigned long WriteString(const string &S) {return Owner->WriteStringInMap(S);};
+ inline unsigned long WriteString(const std::string &S) {return Owner->WriteStringInMap(S);};
inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->WriteStringInMap(S,Size);};
- bool NewDepends(pkgCache::VerIterator &Ver,const string &Package, const string &Arch,
- const string &Version,unsigned int Op,
+ bool NewDepends(pkgCache::VerIterator &Ver,const std::string &Package, const std::string &Arch,
+ const std::string &Version,unsigned int Op,
unsigned int Type);
- bool NewProvides(pkgCache::VerIterator &Ver,const string &PkgName,
- const string &PkgArch, const string &Version);
+ bool NewProvides(pkgCache::VerIterator &Ver,const std::string &PkgName,
+ const std::string &PkgArch, const std::string &Version);
public:
// These all operate against the current section
- virtual string Package() = 0;
- virtual string Architecture() = 0;
+ virtual std::string Package() = 0;
+ virtual std::string Architecture() = 0;
virtual bool ArchitectureAll() = 0;
- virtual string Version() = 0;
+ virtual std::string Version() = 0;
virtual bool NewVersion(pkgCache::VerIterator &Ver) = 0;
- virtual string Description() = 0;
- virtual string DescriptionLanguage() = 0;
+ virtual std::string Description() = 0;
+ virtual std::string DescriptionLanguage() = 0;
virtual MD5SumValue Description_md5() = 0;
virtual unsigned short VersionHash() = 0;
virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
@@ -170,18 +175,4 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
MMap **OutMap = 0,bool AllowMem = false);
bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap);
-
-#ifdef APT_COMPATIBILITY
-#if APT_COMPATIBILITY != 986
-#warning "Using APT_COMPATIBILITY"
-#endif
-MMap *pkgMakeStatusCacheMem(pkgSourceList &List,OpProgress &Progress)
-{
- MMap *Map = 0;
- if (pkgCacheGenerator::MakeStatusCache(List,&Progress,&Map,true) == false)
- return 0;
- return Map;
-}
-#endif
-
#endif
diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index 1a7585d8f..c5b3bebd7 100644
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -9,12 +9,14 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/indexfile.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
-
-#include <apti18n.h>
+
+#include <apti18n.h>
/*}}}*/
// Records::pkgRecords - Constructor /*{{{*/
@@ -44,7 +46,7 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache),
/* */
pkgRecords::~pkgRecords()
{
- for ( vector<Parser*>::iterator it = Files.begin();
+ for ( std::vector<Parser*>::iterator it = Files.begin();
it != Files.end();
++it)
{
diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index ce92cacc4..3658435e8 100644
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -19,7 +19,6 @@
#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/fileutl.h>
#include <vector>
class pkgRecords /*{{{*/
@@ -55,23 +54,23 @@ class pkgRecords::Parser /*{{{*/
friend class pkgRecords;
// These refer to the archive file for the Version
- virtual string FileName() {return string();};
- virtual string MD5Hash() {return string();};
- virtual string SHA1Hash() {return string();};
- virtual string SHA256Hash() {return string();};
- virtual string SHA512Hash() {return string();};
- virtual string SourcePkg() {return string();};
- virtual string SourceVer() {return string();};
+ virtual std::string FileName() {return std::string();};
+ virtual std::string MD5Hash() {return std::string();};
+ virtual std::string SHA1Hash() {return std::string();};
+ virtual std::string SHA256Hash() {return std::string();};
+ virtual std::string SHA512Hash() {return std::string();};
+ virtual std::string SourcePkg() {return std::string();};
+ virtual std::string SourceVer() {return std::string();};
// These are some general stats about the package
- virtual string Maintainer() {return string();};
- virtual string ShortDesc() {return string();};
- virtual string LongDesc() {return string();};
- virtual string Name() {return string();};
- virtual string Homepage() {return string();}
+ virtual std::string Maintainer() {return std::string();};
+ virtual std::string ShortDesc() {return std::string();};
+ virtual std::string LongDesc() {return std::string();};
+ virtual std::string Name() {return std::string();};
+ virtual std::string Homepage() {return std::string();}
// An arbitrary custom field
- virtual string RecordField(const char *fieldName) { return string();};
+ virtual std::string RecordField(const char *fieldName) { return std::string();};
// The record in binary form
virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;};
diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc
index 6dd2d3ee4..f61c140fa 100644
--- a/apt-pkg/pkgsystem.cc
+++ b/apt-pkg/pkgsystem.cc
@@ -10,6 +10,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/policy.h>
#include <cassert>
diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h
index 246762e0b..211fd0d56 100644
--- a/apt-pkg/pkgsystem.h
+++ b/apt-pkg/pkgsystem.h
@@ -37,14 +37,16 @@
#ifndef PKGLIB_PKGSYSTEM_H
#define PKGLIB_PKGSYSTEM_H
+#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/depcache.h>
#include <vector>
-
+
+class pkgDepCache;
class pkgPackageManager;
class pkgVersioningSystem;
class Configuration;
class pkgIndexFile;
+class PkgFileIterator;
class pkgSystem
{
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 0cc77e0af..b47dab90c 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -23,6 +23,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/policy.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/tagfile.h>
@@ -31,10 +33,10 @@
#include <apt-pkg/error.h>
#include <apt-pkg/sptr.h>
-#include <apti18n.h>
-
#include <iostream>
#include <sstream>
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -64,7 +66,8 @@ pkgPolicy::pkgPolicy(pkgCache *Owner) : Pins(0), PFPriority(0), Cache(Owner)
{
if ((F->Archive != 0 && vm.ExpressionMatches(DefRel, F.Archive()) == true) ||
(F->Codename != 0 && vm.ExpressionMatches(DefRel, F.Codename()) == true) ||
- (F->Version != 0 && vm.ExpressionMatches(DefRel, F.Version()) == true))
+ (F->Version != 0 && vm.ExpressionMatches(DefRel, F.Version()) == true) ||
+ (DefRel.length() > 2 && DefRel[1] == '='))
found = true;
}
if (found == false)
diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index 92d32728f..3c8246e3b 100644
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -38,8 +38,6 @@
#include <apt-pkg/versionmatch.h>
#include <vector>
-using std::vector;
-
class pkgPolicy : public pkgDepCache::Policy
{
protected:
@@ -47,29 +45,29 @@ class pkgPolicy : public pkgDepCache::Policy
struct Pin
{
pkgVersionMatch::MatchType Type;
- string Data;
+ std::string Data;
signed short Priority;
Pin() : Type(pkgVersionMatch::None), Priority(0) {};
};
struct PkgPin : Pin
{
- string Pkg;
- PkgPin(string const &Pkg) : Pin(), Pkg(Pkg) {};
+ std::string Pkg;
+ PkgPin(std::string const &Pkg) : Pin(), Pkg(Pkg) {};
};
Pin *Pins;
signed short *PFPriority;
- vector<Pin> Defaults;
- vector<PkgPin> Unmatched;
+ std::vector<Pin> Defaults;
+ std::vector<PkgPin> Unmatched;
pkgCache *Cache;
bool StatusOverride;
public:
// Things for manipulating pins
- void CreatePin(pkgVersionMatch::MatchType Type,string Pkg,
- string Data,signed short Priority);
+ void CreatePin(pkgVersionMatch::MatchType Type,std::string Pkg,
+ std::string Data,signed short Priority);
pkgCache::VerIterator GetMatch(pkgCache::PkgIterator const &Pkg);
// Things for the cache interface.
@@ -83,7 +81,7 @@ class pkgPolicy : public pkgDepCache::Policy
virtual ~pkgPolicy() {delete [] PFPriority; delete [] Pins;};
};
-bool ReadPinFile(pkgPolicy &Plcy,string File = "");
-bool ReadPinDir(pkgPolicy &Plcy,string Dir = "");
+bool ReadPinFile(pkgPolicy &Plcy, std::string File = "");
+bool ReadPinDir(pkgPolicy &Plcy, std::string Dir = "");
#endif
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 47800b0c2..f5f458099 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -8,15 +8,19 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/configuration.h>
-
-#include <apti18n.h>
+#include <apt-pkg/metaindex.h>
+#include <apt-pkg/indexfile.h>
#include <fstream>
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -266,7 +270,7 @@ bool pkgSourceList::ReadAppend(string File)
// CNC:2003-02-20 - Do not break if '#' is inside [].
for (I = Buffer; *I != 0 && *I != '#'; I++)
if (*I == '[')
- for (I++; *I != 0 && *I != ']'; I++);
+ I = strchr(I + 1, ']');
*I = 0;
const char *C = _strstrip(Buffer);
diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 7b473ee64..4509e54b9 100644
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -31,13 +31,15 @@
#include <vector>
#include <map>
#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/metaindex.h>
using std::string;
using std::vector;
-class pkgAquire;
+class pkgAcquire;
+class pkgIndexFile;
+class metaIndex;
+
class pkgSourceList
{
public:
diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc
index 946ac1a1a..f6d2d5158 100644
--- a/apt-pkg/srcrecords.cc
+++ b/apt-pkg/srcrecords.cc
@@ -11,12 +11,15 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/srcrecords.h>
#include <apt-pkg/error.h>
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/strutl.h>
-
-#include <apti18n.h>
+#include <apt-pkg/metaindex.h>
+
+#include <apti18n.h>
/*}}}*/
// SrcRecords::pkgSrcRecords - Constructor /*{{{*/
diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index 8a78d7711..a55bc74fa 100644
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -15,10 +15,7 @@
#include <string>
-#include <vector>
-
-using std::string;
-using std::vector;
+#include <vector>
class pkgSourceList;
class pkgIndexFile;
@@ -29,10 +26,10 @@ class pkgSrcRecords
// Describes a single file
struct File
{
- string MD5Hash;
+ std::string MD5Hash;
unsigned long Size;
- string Path;
- string Type;
+ std::string Path;
+ std::string Type;
};
// Abstract parser for each source record
@@ -49,8 +46,8 @@ class pkgSrcRecords
struct BuildDepRec
{
- string Package;
- string Version;
+ std::string Package;
+ std::string Version;
unsigned int Op;
unsigned char Type;
};
@@ -61,18 +58,18 @@ class pkgSrcRecords
virtual bool Step() = 0;
virtual bool Jump(unsigned long const &Off) = 0;
virtual unsigned long Offset() = 0;
- virtual string AsStr() = 0;
+ virtual std::string AsStr() = 0;
- virtual string Package() const = 0;
- virtual string Version() const = 0;
- virtual string Maintainer() const = 0;
- virtual string Section() const = 0;
+ virtual std::string Package() const = 0;
+ virtual std::string Version() const = 0;
+ virtual std::string Maintainer() const = 0;
+ virtual std::string Section() const = 0;
virtual const char **Binaries() = 0; // Ownership does not transfer
- virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0;
+ virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0;
static const char *BuildDepType(unsigned char const &Type);
- virtual bool Files(vector<pkgSrcRecords::File> &F) = 0;
+ virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0;
Parser(const pkgIndexFile *Index) : iIndex(Index) {};
virtual ~Parser() {};
@@ -83,8 +80,8 @@ class pkgSrcRecords
void *d;
// The list of files and the current parser pointer
- vector<Parser*> Files;
- vector<Parser *>::iterator Current;
+ std::vector<Parser*> Files;
+ std::vector<Parser *>::iterator Current;
public:
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index a8f04b23a..ec86173df 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -11,15 +11,18 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/tagfile.h>
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
-#include <apti18n.h>
-
#include <string>
#include <stdio.h>
#include <ctype.h>
+
+#include <apti18n.h>
/*}}}*/
using std::string;
@@ -27,7 +30,7 @@ using std::string;
class pkgTagFilePrivate
{
public:
- pkgTagFilePrivate(FileFd *pFd, unsigned long Size) : Fd(*pFd), Size(Size)
+ pkgTagFilePrivate(FileFd *pFd, unsigned long long Size) : Fd(*pFd), Size(Size)
{
}
FileFd &Fd;
@@ -35,14 +38,14 @@ public:
char *Start;
char *End;
bool Done;
- unsigned long iOffset;
- unsigned long Size;
+ unsigned long long iOffset;
+ unsigned long long Size;
};
// TagFile::pkgTagFile - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size)
+pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long long Size)
{
d = new pkgTagFilePrivate(pFd, Size);
@@ -84,7 +87,7 @@ unsigned long pkgTagFile::Offset()
bool pkgTagFile::Resize()
{
char *tmp;
- unsigned long EndSize = d->End - d->Start;
+ unsigned long long EndSize = d->End - d->Start;
// fail is the buffer grows too big
if(d->Size > 1024*1024+1)
@@ -136,8 +139,8 @@ bool pkgTagFile::Step(pkgTagSection &Tag)
then fills the rest from the file */
bool pkgTagFile::Fill()
{
- unsigned long EndSize = d->End - d->Start;
- unsigned long Actual = 0;
+ unsigned long long EndSize = d->End - d->Start;
+ unsigned long long Actual = 0;
memmove(d->Buffer,d->Start,EndSize);
d->Start = d->Buffer;
@@ -178,12 +181,12 @@ bool pkgTagFile::Fill()
// ---------------------------------------------------------------------
/* This jumps to a pre-recorded file location and reads the record
that is there */
-bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
+bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long long Offset)
{
// We are within a buffer space of the next hit..
if (Offset >= d->iOffset && d->iOffset + (d->End - d->Start) > Offset)
{
- unsigned long Dist = Offset - d->iOffset;
+ unsigned long long Dist = Offset - d->iOffset;
d->Start += Dist;
d->iOffset += Dist;
return Step(Tag);
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 3a2dee7c7..a5bf5ac90 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -20,10 +20,12 @@
#ifndef PKGLIB_TAGFILE_H
#define PKGLIB_TAGFILE_H
-
-#include <apt-pkg/fileutl.h>
#include <stdio.h>
+#include <string>
+
+class FileFd;
+
class pkgTagSection
{
const char *Section;
@@ -54,7 +56,7 @@ class pkgTagSection
bool Find(const char *Tag,const char *&Start, const char *&End) const;
bool Find(const char *Tag,unsigned &Pos) const;
- string FindS(const char *Tag) const;
+ std::string FindS(const char *Tag) const;
signed int FindI(const char *Tag,signed long Default = 0) const ;
unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const;
bool FindFlag(const char *Tag,unsigned long &Flags,
@@ -94,9 +96,9 @@ class pkgTagFile
bool Step(pkgTagSection &Section);
unsigned long Offset();
- bool Jump(pkgTagSection &Tag,unsigned long Offset);
+ bool Jump(pkgTagSection &Tag,unsigned long long Offset);
- pkgTagFile(FileFd *F,unsigned long Size = 32*1024);
+ pkgTagFile(FileFd *F,unsigned long long Size = 32*1024);
virtual ~pkgTagFile();
};
diff --git a/apt-pkg/vendor.cc b/apt-pkg/vendor.cc
index 2350afe69..36fc25957 100644
--- a/apt-pkg/vendor.cc
+++ b/apt-pkg/vendor.cc
@@ -1,3 +1,5 @@
+#include<config.h>
+
#include <iostream>
#include <apt-pkg/error.h>
#include <apt-pkg/vendor.h>
@@ -20,16 +22,16 @@ Vendor::Vendor(std::string VendorID,
delete FingerprintList;
}
-const string Vendor::LookupFingerprint(string Print) const
+const std::string Vendor::LookupFingerprint(std::string Print) const
{
- std::map<string,string>::const_iterator Elt = Fingerprints.find(Print);
+ std::map<std::string,std::string>::const_iterator Elt = Fingerprints.find(Print);
if (Elt == Fingerprints.end())
return "";
else
return (*Elt).second;
}
-bool Vendor::CheckDist(string Dist)
+bool Vendor::CheckDist(std::string Dist)
{
return true;
}
diff --git a/apt-pkg/vendor.h b/apt-pkg/vendor.h
index df229737a..9b157378c 100644
--- a/apt-pkg/vendor.h
+++ b/apt-pkg/vendor.h
@@ -6,29 +6,27 @@
#include <apt-pkg/macros.h>
-using std::string;
-
-// A class representing a particular software provider.
+// A class representing a particular software provider.
class __deprecated Vendor
{
public:
struct Fingerprint
{
- string Print;
- string Description;
+ std::string Print;
+ std::string Description;
};
protected:
- string VendorID;
- string Origin;
- std::map<string, string> Fingerprints;
+ std::string VendorID;
+ std::string Origin;
+ std::map<std::string, std::string> Fingerprints;
public:
- Vendor(string VendorID, string Origin,
+ Vendor(std::string VendorID, std::string Origin,
std::vector<struct Fingerprint *> *FingerprintList);
- virtual const string& GetVendorID() const { return VendorID; };
- virtual const string LookupFingerprint(string Print) const;
- virtual bool CheckDist(string Dist);
+ virtual const std::string& GetVendorID() const { return VendorID; };
+ virtual const std::string LookupFingerprint(std::string Print) const;
+ virtual bool CheckDist(std::string Dist);
virtual ~Vendor(){};
};
diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 4cc500727..ecfc7db87 100644
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -1,13 +1,20 @@
+#include<config.h>
+
#include <apt-pkg/fileutl.h>
#include <apt-pkg/error.h>
+#include <apt-pkg/configuration.h>
#include <apti18n.h>
#if __GNUC__ >= 4
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
+#include <apt-pkg/vendor.h>
#include <apt-pkg/vendorlist.h>
+using std::string;
+using std::vector;
+
pkgVendorList::~pkgVendorList()
{
for (vector<const Vendor *>::const_iterator I = VendorList.begin();
diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h
index eaeecb173..733d23a32 100644
--- a/apt-pkg/vendorlist.h
+++ b/apt-pkg/vendorlist.h
@@ -15,26 +15,23 @@
#include <string>
#include <vector>
-#include <apt-pkg/vendor.h>
-#include <apt-pkg/configuration.h>
#include <apt-pkg/macros.h>
-using std::string;
-using std::vector;
-
+class Vendor;
+class Configuration;
class __deprecated pkgVendorList
{
protected:
- vector<Vendor const *> VendorList;
+ std::vector<Vendor const *> VendorList;
bool CreateList(Configuration& Cnf);
- const Vendor* LookupFingerprint(string Fingerprint);
+ const Vendor* LookupFingerprint(std::string Fingerprint);
public:
- typedef vector<Vendor const *>::const_iterator const_iterator;
+ typedef std::vector<Vendor const *>::const_iterator const_iterator;
bool ReadMainList();
- bool Read(string File);
+ bool Read(std::string File);
// List accessors
inline const_iterator begin() const {return VendorList.begin();};
@@ -42,7 +39,7 @@ class __deprecated pkgVendorList
inline unsigned int size() const {return VendorList.size();};
inline bool empty() const {return VendorList.empty();};
- const Vendor* FindVendor(const vector<string> GPGVOutput);
+ const Vendor* FindVendor(const std::vector<std::string> GPGVOutput);
~pkgVendorList();
};
diff --git a/apt-pkg/version.cc b/apt-pkg/version.cc
index 42e449d36..a9d4fb763 100644
--- a/apt-pkg/version.cc
+++ b/apt-pkg/version.cc
@@ -8,6 +8,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/version.h>
#include <apt-pkg/pkgcache.h>
diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index 49c53a93a..92dbc2576 100644
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -20,12 +20,9 @@
#ifndef PKGLIB_VERSION_H
#define PKGLIB_VERSION_H
-
-#include <apt-pkg/strutl.h>
+#include <apt-pkg/strutl.h>
#include <string>
-using std::string;
-
class pkgVersioningSystem
{
public:
@@ -43,7 +40,7 @@ class pkgVersioningSystem
virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer) = 0;
virtual int DoCmpReleaseVer(const char *A,const char *Aend,
const char *B,const char *Bend) = 0;
- virtual string UpstreamVersion(const char *A) = 0;
+ virtual std::string UpstreamVersion(const char *A) = 0;
// See if the given VS is compatible with this one..
virtual bool TestCompatibility(pkgVersioningSystem const &Against)
@@ -57,8 +54,4 @@ class pkgVersioningSystem
virtual ~pkgVersioningSystem() {};
};
-#ifdef APT_COMPATIBILITY
-#include <apt-pkg/debversion.h>
-#endif
-
#endif
diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index 6d667acad..e4fa0ea65 100644
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -11,8 +11,9 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include <apt-pkg/versionmatch.h>
+#include<config.h>
+#include <apt-pkg/versionmatch.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
@@ -21,9 +22,10 @@
#include <fnmatch.h>
#include <sys/types.h>
#include <regex.h>
-
/*}}}*/
+using std::string;
+
// VersionMatch::pkgVersionMatch - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* Break up the data string according to the selected type */
diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index 39639a23d..da103fc5b 100644
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -39,40 +39,38 @@
#include <string>
#include <apt-pkg/pkgcache.h>
-using std::string;
-
class pkgVersionMatch
{
// Version Matching
- string VerStr;
+ std::string VerStr;
bool VerPrefixMatch;
// Release Matching
- string RelVerStr;
+ std::string RelVerStr;
bool RelVerPrefixMatch;
- string RelOrigin;
- string RelRelease;
- string RelCodename;
- string RelArchive;
- string RelLabel;
- string RelComponent;
- string RelArchitecture;
+ std::string RelOrigin;
+ std::string RelRelease;
+ std::string RelCodename;
+ std::string RelArchive;
+ std::string RelLabel;
+ std::string RelComponent;
+ std::string RelArchitecture;
bool MatchAll;
// Origin Matching
- string OrSite;
+ std::string OrSite;
public:
enum MatchType {None = 0,Version,Release,Origin} Type;
- bool MatchVer(const char *A,string B,bool Prefix);
+ bool MatchVer(const char *A,std::string B,bool Prefix);
bool ExpressionMatches(const char *pattern, const char *string);
bool ExpressionMatches(const std::string& pattern, const char *string);
bool FileMatch(pkgCache::PkgFileIterator File);
pkgCache::VerIterator Find(pkgCache::PkgIterator Pkg);
- pkgVersionMatch(string Data,MatchType Type);
+ pkgVersionMatch(std::string Data,MatchType Type);
};
#endif
diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index b3609a700..256911231 100644
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -33,6 +33,9 @@
/* If there is no socklen_t, define this for the netdb shim */
#undef NEED_SOCKLEN_T_DEFINE
+/* Define to the size of the filesize containing structures */
+#undef _FILE_OFFSET_BITS
+
/* Define the arch name string */
#undef COMMON_ARCH
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index bf93bd2ee..edb089160 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -118,10 +118,10 @@ MKDIRS := $(BIN)
# list
.PHONY: headers library clean veryclean all binary program doc dirs
.PHONY: maintainer-clean dist-clean distclean pristine sanity
-all: binary doc
+all: dirs binary doc
binary: library program
maintainer-clean dist-clean distclean pristine sanity: veryclean
-headers library clean veryclean program:
+headers library clean veryclean program test:
veryclean:
echo Very Clean done for $(SUBDIR)
diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
index d2db949ea..1ccb08804 100644
--- a/cmdline/acqprogress.cc
+++ b/cmdline/acqprogress.cc
@@ -8,19 +8,21 @@
##################################################################### */
/*}}}*/
// Include files /*{{{*/
-#include "acqprogress.h"
+#include<config.h>
+
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/acquire-worker.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
-#include <apti18n.h>
-
#include <stdio.h>
#include <signal.h>
#include <iostream>
#include <unistd.h>
+
+#include "acqprogress.h"
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -161,7 +163,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
ScreenWidth = sizeof(Buffer)-1;
// Put in the percent done
- sprintf(S,"%ld%%",long(double((CurrentBytes + CurrentItems)*100.0)/double(TotalBytes+TotalItems)));
+ sprintf(S,"%.0f%%",((CurrentBytes + CurrentItems)*100.0)/(TotalBytes+TotalItems));
bool Shown = false;
for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
@@ -212,11 +214,11 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
if (I->TotalSize > 0 && I->CurrentItem->Owner->Complete == false)
{
if (Mode == Short)
- snprintf(S,End-S," %lu%%",
- long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
+ snprintf(S,End-S," %.0f%%",
+ (I->CurrentSize*100.0)/I->TotalSize);
else
- snprintf(S,End-S,"/%sB %lu%%",SizeToStr(I->TotalSize).c_str(),
- long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
+ snprintf(S,End-S,"/%sB %.0f%%",SizeToStr(I->TotalSize).c_str(),
+ (I->CurrentSize*100.0)/I->TotalSize);
}
S += strlen(S);
snprintf(S,End-S,"]");
@@ -236,7 +238,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
if (CurrentCPS != 0)
{
char Tmp[300];
- unsigned long ETA = (unsigned long)((TotalBytes - CurrentBytes)/CurrentCPS);
+ unsigned long long ETA = (TotalBytes - CurrentBytes)/CurrentCPS;
sprintf(Tmp," %sB/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
unsigned int Len = strlen(Buffer);
unsigned int LenT = strlen(Tmp);
diff --git a/cmdline/acqprogress.h b/cmdline/acqprogress.h
index 48f90ae59..8f0903923 100644
--- a/cmdline/acqprogress.h
+++ b/cmdline/acqprogress.h
@@ -12,6 +12,8 @@
#include <apt-pkg/acquire.h>
+#include <string>
+
class AcqTextStatus : public pkgAcquireStatus
{
unsigned int &ScreenWidth;
@@ -21,7 +23,7 @@ class AcqTextStatus : public pkgAcquireStatus
public:
- virtual bool MediaChange(string Media,string Drive);
+ virtual bool MediaChange(std::string Media,std::string Drive);
virtual void IMSHit(pkgAcquire::ItemDesc &Itm);
virtual void Fetch(pkgAcquire::ItemDesc &Itm);
virtual void Done(pkgAcquire::ItemDesc &Itm);
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index db5475227..82a31c9b1 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -13,9 +13,9 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/error.h>
-#include <cassert>
-#include <apt-pkg/pkgcachegen.h>
#include <apt-pkg/cachefile.h>
#include <apt-pkg/cacheset.h>
#include <apt-pkg/init.h>
@@ -23,6 +23,7 @@
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/cmndline.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/srcrecords.h>
#include <apt-pkg/version.h>
@@ -30,18 +31,21 @@
#include <apt-pkg/tagfile.h>
#include <apt-pkg/algorithms.h>
#include <apt-pkg/sptr.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/metaindex.h>
-#include <config.h>
-#include <apti18n.h>
-
+#include <cassert>
#include <locale.h>
#include <iostream>
#include <unistd.h>
#include <errno.h>
#include <regex.h>
#include <stdio.h>
-
#include <iomanip>
+#include <algorithm>
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index d1268edf9..fa48debcd 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -11,6 +11,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/cmndline.h>
#include <apt-pkg/error.h>
#include <apt-pkg/init.h>
@@ -21,10 +23,8 @@
#include <apt-pkg/acquire.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/cdrom.h>
-#include <config.h>
-#include <apti18n.h>
-
-//#include "indexcopy.h"
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/pkgsystem.h>
#include <locale.h>
#include <iostream>
@@ -36,6 +36,8 @@
#include <dirent.h>
#include <unistd.h>
#include <stdio.h>
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 589ee7ada..94f6ee9b0 100644
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -16,20 +16,22 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/cmndline.h>
#include <apt-pkg/error.h>
#include <apt-pkg/init.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/aptconfiguration.h>
-
-#include <config.h>
-#include <apti18n.h>
+#include <apt-pkg/pkgsystem.h>
#include <locale.h>
#include <iostream>
#include <string>
#include <vector>
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc
index dab0cc6fd..e82e15c6e 100644
--- a/cmdline/apt-dump-solver.cc
+++ b/cmdline/apt-dump-solver.cc
@@ -12,6 +12,7 @@
#include <config.h>
#include <cstdio>
+#include <iostream>
/*}}}*/
// ShowHelp - Show a help screen /*{{{*/
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 07bc0c25d..d5c1a3208 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -13,6 +13,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/init.h>
#include <apt-pkg/cmndline.h>
#include <apt-pkg/pkgcache.h>
@@ -28,7 +30,8 @@
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
-
+#include <apt-pkg/pkgsystem.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -36,7 +39,6 @@
#include <fstream>
#include <locale.h>
-#include <config.h>
#include <apti18n.h>
#include "apt-extracttemplates.h"
/*}}}*/
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 41d90b719..d2e44aae0 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -25,8 +25,7 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#define _LARGEFILE_SOURCE
-#define _LARGEFILE64_SOURCE
+#include <config.h>
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/error.h>
@@ -37,6 +36,7 @@
#include <apt-pkg/algorithms.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
#include <apt-pkg/clean.h>
#include <apt-pkg/srcrecords.h>
#include <apt-pkg/version.h>
@@ -45,9 +45,10 @@
#include <apt-pkg/sptr.h>
#include <apt-pkg/md5.h>
#include <apt-pkg/versionmatch.h>
-
-#include <config.h>
-#include <apti18n.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/indexfile.h>
#include "acqprogress.h"
@@ -68,8 +69,7 @@
#include <sys/wait.h>
#include <sstream>
-#define statfs statfs64
-#define statvfs statvfs64
+#include <apti18n.h>
/*}}}*/
#define RAMFS_MAGIC 0x858458f6
@@ -1630,7 +1630,8 @@ bool DoUpdate(CommandLine &CmdL)
if (_config->FindB("APT::Get::Download",true) == true)
ListUpdate(Stat, *List);
- // Rebuild the cache.
+ // Rebuild the cache.
+ pkgCacheFile::RemoveCaches();
if (Cache.BuildCaches() == false)
return false;
@@ -1688,8 +1689,9 @@ bool DoAutomaticRemove(CacheFile &Cache)
// install it in the first place, so nuke it instead of show it
if (Cache[Pkg].Install() == true && Pkg.CurrentVer() == 0)
{
+ if (Pkg.CandVersion() != 0)
+ tooMuch.insert(Pkg);
Cache->MarkDelete(Pkg, false);
- tooMuch.insert(Pkg);
}
// only show stuff in the list that is not yet marked for removal
else if(hideAutoRemove == false && Cache[Pkg].Delete() == false)
@@ -1713,33 +1715,41 @@ bool DoAutomaticRemove(CacheFile &Cache)
bool Changed;
do {
Changed = false;
- for (APT::PackageSet::const_iterator P = tooMuch.begin();
- P != tooMuch.end() && Changed == false; ++P)
+ for (APT::PackageSet::const_iterator Pkg = tooMuch.begin();
+ Pkg != tooMuch.end() && Changed == false; ++Pkg)
{
- for (pkgCache::DepIterator R = P.RevDependsList();
- R.end() == false; ++R)
- {
- if (R.IsNegative() == true ||
- Cache->IsImportantDep(R) == false)
- continue;
- pkgCache::PkgIterator N = R.ParentPkg();
- if (N.end() == true || (N->CurrentVer == 0 && (*Cache)[N].Install() == false))
- continue;
- if (Debug == true)
- std::clog << "Save " << P << " as another installed garbage package depends on it" << std::endl;
- Cache->MarkInstall(P, false);
- if(hideAutoRemove == false)
+ APT::PackageSet too;
+ too.insert(Pkg);
+ for (pkgCache::PrvIterator Prv = Cache[Pkg].CandidateVerIter(Cache).ProvidesList();
+ Prv.end() == false; ++Prv)
+ too.insert(Prv.ParentPkg());
+ for (APT::PackageSet::const_iterator P = too.begin();
+ P != too.end() && Changed == false; ++P) {
+ for (pkgCache::DepIterator R = P.RevDependsList();
+ R.end() == false; ++R)
{
- ++autoRemoveCount;
- if (smallList == false)
- {
- autoremovelist += P.FullName(true) + " ";
- autoremoveversions += string(Cache[P].CandVersion) + "\n";
- }
+ if (R.IsNegative() == true ||
+ Cache->IsImportantDep(R) == false)
+ continue;
+ pkgCache::PkgIterator N = R.ParentPkg();
+ if (N.end() == true || (N->CurrentVer == 0 && (*Cache)[N].Install() == false))
+ continue;
+ if (Debug == true)
+ std::clog << "Save " << Pkg << " as another installed garbage package depends on it" << std::endl;
+ Cache->MarkInstall(Pkg, false);
+ if (hideAutoRemove == false)
+ {
+ ++autoRemoveCount;
+ if (smallList == false)
+ {
+ autoremovelist += Pkg.FullName(true) + " ";
+ autoremoveversions += string(Cache[Pkg].CandVersion) + "\n";
+ }
+ }
+ tooMuch.erase(Pkg);
+ Changed = true;
+ break;
}
- tooMuch.erase(P);
- Changed = true;
- break;
}
}
} while (Changed == true);
@@ -2210,10 +2220,14 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
/* */
bool DoClean(CommandLine &CmdL)
{
+ std::string const archivedir = _config->FindDir("Dir::Cache::archives");
+ std::string const pkgcache = _config->FindFile("Dir::cache::pkgcache");
+ std::string const srcpkgcache = _config->FindFile("Dir::cache::srcpkgcache");
+
if (_config->FindB("APT::Get::Simulate") == true)
{
- cout << "Del " << _config->FindDir("Dir::Cache::archives") << "* " <<
- _config->FindDir("Dir::Cache::archives") << "partial/*" << endl;
+ cout << "Del " << archivedir << "* " << archivedir << "partial/*"<< endl
+ << "Del " << pkgcache << " " << srcpkgcache << endl;
return true;
}
@@ -2221,14 +2235,17 @@ bool DoClean(CommandLine &CmdL)
FileFd Lock;
if (_config->FindB("Debug::NoLocking",false) == false)
{
- Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
+ Lock.Fd(GetLock(archivedir + "lock"));
if (_error->PendingError() == true)
return _error->Error(_("Unable to lock the download directory"));
}
pkgAcquire Fetcher;
- Fetcher.Clean(_config->FindDir("Dir::Cache::archives"));
- Fetcher.Clean(_config->FindDir("Dir::Cache::archives") + "partial/");
+ Fetcher.Clean(archivedir);
+ Fetcher.Clean(archivedir + "partial/");
+
+ pkgCacheFile::RemoveCaches();
+
return true;
}
/*}}}*/
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index ef6c688fe..1b636e4d5 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -11,10 +11,12 @@
#include <apt-pkg/cmndline.h>
#include <apt-pkg/init.h>
#include <apt-pkg/cachefile.h>
+#include <apt-pkg/cacheset.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/edsp.h>
#include <apt-pkg/algorithms.h>
#include <apt-pkg/fileutl.h>
+#include <apt-pkg/pkgsystem.h>
#include <config.h>
#include <apti18n.h>
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 7bfe47fca..c3d9d9aff 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -168,7 +168,7 @@ if [ "$1" = "--keyring" ]; then
#echo "keyfile given"
shift
TRUSTEDFILE="$1"
- if [ -r "$TRUSTEDFILE" ]; then
+ if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ]; then
GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE"
else
echo >&2 "Error: The specified keyring »$TRUSTEDFILE« is missing or not readable"
diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index b2c664979..339cbdf44 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -5,17 +5,19 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/cachefile.h>
#include <apt-pkg/cacheset.h>
#include <apt-pkg/cmndline.h>
#include <apt-pkg/error.h>
#include <apt-pkg/init.h>
#include <apt-pkg/strutl.h>
-
-#include <config.h>
-#include <apti18n.h>
+#include <apt-pkg/pkgsystem.h>
#include <algorithm>
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index f95a434cc..20ae14f2a 100644
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -12,21 +12,24 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/tagfile.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/cmndline.h>
#include <apt-pkg/init.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/pkgsystem.h>
-#include <config.h>
-#include <apti18n.h>
-
#include <vector>
#include <algorithm>
#include <locale.h>
#include <unistd.h>
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
diff --git a/configure.in b/configure.in
index 3dde2fe47..c2602cf36 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.8.15")
+AC_DEFINE_UNQUOTED(VERSION,"0.8.16~exp6")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
@@ -31,6 +31,10 @@ AC_CHECK_TOOL_PREFIX
AC_PROG_CC
AC_ISC_POSIX
+dnl check for large file support and enable it if possible
+dnl do this early as other stuff might depend on it
+AC_SYS_LARGEFILE
+
dnl Check for other programs
AC_PROG_CXX
AC_PROG_CPP
@@ -151,7 +155,7 @@ if test "$cross_compiling" = "yes" -a "x$archline" = "x"; then
AC_MSG_ERROR(When cross compiling, architecture must be present in sizetable)
fi
AC_C_BIGENDIAN
-
+
dnl We do not need this if we have inttypes!
HAVE_C9X=yes
if test x"$apt_cv_c9x_ints" = x"no"; then
diff --git a/debian/changelog b/debian/changelog
index d5bcaee67..d34052343 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,218 @@
+apt (0.8.16~exp8ubuntu1) UNRELEASED; urgency=low
+
+ * merge from debian/experimental:
+ - new ABI
+ - header reshuffling that may cause FTBFS
+ * DO NOT UPLOAD YET; THERE IS ANOTHER ABI BREAK COMMING SOON
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2011 16:51:36 +0100
+
+apt (0.8.16~exp8) experimental; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/packagemanager.cc:
+ - do not fail on unpacked packages in SmartUnPack, just don't
+ shedule them for unpack, but do all checks and configure them
+ - do not enter an endless loop for (essential) pre-dependency loops
+ * apt-pkg/contrib/sha2_internal.cc:
+ - use a pointer-union to peace gcc strict-aliasing warning
+ * apt-pkg/deb/deblistparser.cc:
+ - M-A: foreign packages provide for other archs, too
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Thu, 03 Nov 2011 09:40:29 -0500
+
+apt (0.8.16~exp7) experimental; urgency=low
+
+ [ David Kalnischkies ]
+ * do not pollute namespace in the headers with using (Closes: #500198)
+ * use forward declaration in headers if possible instead of includes
+ * remove old APT_COMPATIBILITY ifdef's
+ * apt-pkg/deb/dpkgpm.cc:
+ - use std::vector instead of fixed size arrays to store args and
+ multiarch-packagename strings
+ - load the dpkg base arguments only one time and reuse them later
+ * cmdline/apt-get.cc:
+ - follow Provides in the evaluation of saving candidates, too, for
+ statisfying garbage package dependencies (Closes: #640590)
+ * apt-pkg/algorithms.cc:
+ - if a package is garbage, don't try to save it with FixByInstall
+ * apt-pkg/deb/debsrcrecords.cc:
+ - remove the limit of 400 Binaries for a source package (Closes: #622110)
+ * apt-pkg/deb/deblistparser.cc:
+ - fix crash when the dynamic mmap needs to be grown in
+ LoadReleaseInfo (LP: #854090)
+ * apt-pkg/deb/debmetaindex.cc:
+ - none is a separator, not a language: no need for Index (Closes: #624218)
+ * apt-pkg/aptconfiguration.cc:
+ - do not builtin languages only if none is forced (Closes: #643787)
+ * apt-pkg/pkgcachegen.cc:
+ - refactor MergeList by creating -Group, -Package and -Version specialist
+ - share description list between "same" versions (LP: #868977)
+ This also means that descriptions are shared across archives now.
+ - add implicit dependencies needed for Multi-Arch at the time a Version
+ struct is created and not at the end of the cache generation
+ * apt-pkg/pkgcache.cc:
+ - always prefer "en" over "" for "en"-language regardless of cache-order
+
+ [ Michael Vogt ]
+ * apt-pkg/contrib/configuration.cc:
+ - fix double delete (LP: #848907)
+ - ignore only the invalid regexp instead of all options
+ * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
+ - fix fetching language information by adding OptionalSubIndexTarget
+ * methods/https.cc:
+ - cleanup broken downloads properly
+
+ [ Colin Watson ]
+ * ftparchive/cachedb.cc:
+ - fix buffersize in bytes2hex
+
+ -- Michael Vogt <mvo@debian.org> Fri, 14 Oct 2011 13:51:35 +0200
+
+apt (0.8.16~exp6) experimental; urgency=low
+
+ [ Christopher Baines ]
+ * enable APT in unpack/configure ordering to handle loops as well
+ as tight dependencies between immediate packages better
+ enabling also the possibility to mark all packages as immediate
+ (at least Closes: #353290, #540227, #559733, #621836, #639290)
+
+ [ David Kalnischkies ]
+ * [abi-break] Support large files in the complete toolset. Indexes of this
+ size are pretty unlikely for now, but we need it for deb
+ packages which could become bigger than 4GB now (LP: #815895)
+ * merged the debian-sid branch
+
+ [ Michael Vogt ]
+ * bump ABI version
+
+ -- Michael Vogt <mvo@debian.org> Wed, 14 Sep 2011 21:06:51 +0200
+
+apt (0.8.16~exp5) experimental; urgency=low
+
+ * merged the latest debian-sid fixes
+ * apt-pkg/makefile:
+ - install sha256.h compat header
+ * apt-pkg/pkgcachegen.{cc,h}:
+ - use ref-to-ptr semantic in NewDepends() to ensure that the
+ libapt does not segfault if the cache is remapped in between
+ (LP: #812862)
+ - fix crash when P.Arch() was used but the cache got remapped
+ * apt-pkg/acquire-item.{cc,h}:
+ - do not check for a "Package" tag in optional index targets
+ like the translations index
+ * apt-pkg/acquire.cc:
+ - fix potential divide-by-zero
+ * methods/mirror.cc:
+ - include the architecture(s) in the query string as well so
+ that the server can make better decisions
+
+ -- Michael Vogt <mvo@debian.org> Mon, 15 Aug 2011 14:52:54 +0200
+
+apt (0.8.16~exp4) experimental; urgency=low
+
+ [ Julian Andres Klode ]
+ * apt-pkg/pkgcache.h:
+ - [ABI break] Add pkgCache::Header::CacheFileSize, storing the cache size
+ * apt-pkg/pkgcachegen.cc:
+ - Write the file size to the cache
+ * apt-pkg/pkgcache.cc:
+ - Check that cache is at least CacheFileSize bytes large (LP: #16467)
+
+ [ Michael Vogt ]
+ * merged latest fixes from debian-sid
+ * apt-pkg/cdrom.{cc,h}:
+ - cleanup old ABI break avoidance hacks
+ * [ABI break] apt-pkg/acquire-item.{cc,h}:
+ - cleanup around OptionalIndexTarget and SubIndexTarget
+ * [ABI break] merged patch from Jonathan Thomas to have a new
+ RecordField() function in the pkgRecorder parser. Many thanks
+ Thomas
+ * [ABI break] merge patch from Jonathan Thomas to speed up the
+ depcache by caching the install-recommends and install-suggests
+ values
+ * apt-pkg/contrib/fileutl.{cc,h}:
+ - add GetModificationTime() helper
+ * apt-pkg/pkgcachegen.cc:
+ - regenerate the cache if the sources.list changes to ensure
+ that changes in the ordering there will be honored by apt
+ * apt-pkg/sourcelist.{cc,h}:
+ - add pkgSourceList::GetLastModifiedTime() helper
+
+ -- Michael Vogt <mvo@debian.org> Thu, 28 Jul 2011 16:57:08 +0200
+
+apt (0.8.16~exp3) experimental; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/pkgcache.h:
+ - readd All{Foreign,Allowed} as suggested by Julian to
+ remain strictly API compatible
+ * apt-pkg/acquire*.{cc,h}:
+ - try even harder to support really big files in the fetcher by
+ converting (hopefully) everything to 'long long' (Closes: #632271)
+ * ftparchive/writer.cc:
+ - generate all checksums in one run over the file for Release
+ * cmdline/apt-get.cc:
+ - add an --assume-no option for testing to say 'no' to everything
+ * apt-pkg/deb/debmetaindex.cc:
+ - add trusted=yes option to mark unsigned (local) repository as trusted
+ based on a patch from Ansgar Burchardt, thanks a lot! (Closes: #596498)
+
+ [ Michael Vogt ]
+ * merge fixes from the debian/unstable upload
+ * merge lp:~mvo/apt/sha512-template to get fixes for the
+ sha1/md5 verifiation (closes: #632520)
+
+ -- Michael Vogt <mvo@debian.org> Fri, 15 Jul 2011 09:56:17 +0200
+
+apt (0.8.16~exp2) experimental; urgency=low
+
+ [ David Kalnischkies ]
+ * [ABI-Break] Implement EDSP in libapt-pkg so that all front-ends which
+ use the internal resolver can now be used also with external
+ ones as the usage is hidden in between the old API
+ * provide two edsp solvers in apt-utils:
+ - 'dump' to quickly output a complete scenario and
+ - 'apt' to use the internal as an external resolver
+ * apt-pkg/pkgcache.h:
+ - clean up mess with the "all" handling in MultiArch to
+ fix LP: #733741 cleanly for everyone now
+ * apt-pkg/depcache.cc:
+ - use a boolean instead of an int for Add/Remove in AddStates
+ similar to how it works with AddSizes
+ - let the Mark methods return if their marking was successful
+ - if a Breaks can't be upgraded, remove it. If it or a Conflict
+ can't be removed the installation of the breaker fails.
+ * cmdline/apt-get.cc:
+ - do not discard the error messages from the resolver and instead
+ only show the general 'Broken packages' message if nothing else
+
+ [ Stefano Zacchiroli ]
+ * doc/external-dependency-solver-protocol.txt:
+ - describe EDSP and the configuration interface around it
+
+ [ Michael Vogt ]
+ * [ABI-Break] merge lp:~mvo/apt/sha512-template to add support for sha512
+ * [ABI-Break] merge lp:~mvo/apt/dpointer to support easier extending
+ without breaking the ABI
+ * increase ABI version and update package names
+
+ -- Michael Vogt <mvo@debian.org> Wed, 29 Jun 2011 13:57:28 +0200
+
+apt (0.8.16~exp1) experimental; urgency=low
+
+ * merged with the debian/unstable upload
+
+ -- Michael Vogt <mvo@debian.org> Wed, 29 Jun 2011 12:40:31 +0200
+
+apt (1.8.15.9+nmu1) unstable; urgency=low
+
+ [ David Kalnischkies ]
+ * algorithms.cc:
+ - show a debug why a package was kept by ResolveByKeep()
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Mon, 17 Oct 2011 16:36:22 +0200
+
apt (0.8.16~exp5ubuntu14.2) UNRELEASED; urgency=low
[ Daniel Hahler ]
@@ -281,6 +496,103 @@ apt (0.8.16~exp1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Wed, 29 Jun 2011 12:40:31 +0200
+apt (0.8.15.9) unstable; urgency=low
+
+ [ David Kalnischkies ]
+ * Symbol file update
+ * doc/apt-get.8.xml:
+ - change wording of autoremove description as suggested
+ by Robert Simmons, thanks! (Closes: #641490)
+ * apt-pkg/deb/dpkgpm.cc:
+ - use std::vector instead of fixed size arrays to store args and
+ multiarch-packagename strings
+ - load the dpkg base arguments only one time and reuse them later
+ * cmdline/apt-get.cc:
+ - follow Provides in the evaluation of saving candidates, too, for
+ statisfying garbage package dependencies (Closes: #640590)
+ * apt-pkg/algorithms.cc:
+ - if a package is garbage, don't try to save it with FixByInstall
+ * apt-pkg/init.cc:
+ - silently ignore *.orig and *.save files by default
+ * apt-pkg/policy.cc:
+ - accept generic release pin expressions again in -t (Closes: #644166)
+ * apt-pkg/deb/debmetaindex.cc:
+ - none is a separator, not a language: no need for Index (Closes: #624218)
+ * apt-pkg/aptconfiguration.cc:
+ - do not builtin languages only if none is forced (Closes: #643787)
+ * doc/apt.conf.5.xml:
+ - apply spelling fix by Kevin Lyda, thanks! (Closes: #644104)
+
+ [ Christian Perrier ]
+ * Fix spelling error (sensée) in French translation. Thanks
+ to Corentin Le Gall for spotting it.
+
+ [ Colin Watson ]
+ * ftparchive/cachedb.cc:
+ - fix buffersize in bytes2hex
+
+ [ Michael Vogt ]
+ * ftparchive/cachedb.cc:
+ - make buffer fully dynamic (thanks to Colin Watson)
+
+ -- Michael Vogt <mvo@debian.org> Fri, 14 Oct 2011 12:00:09 +0200
+
+apt (0.8.15.8) unstable; urgency=low
+
+ [ David Kalnischkies ]
+ * cmdline/apt-get.cc:
+ - output list of virtual package providers to c1out in -q=1
+ instead of /dev/null to unbreak sbuild (LP: #816155)
+
+ [ Michael Vogt ]
+ * apt-pkg/contrib/configuration.cc:
+ - fix double delete (LP: #848907)
+ - ignore only the invalid regexp instead of all options
+
+ -- Michael Vogt <mvo@debian.org> Wed, 14 Sep 2011 12:08:25 +0200
+
+apt (0.8.15.7) unstable; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/packagemanager.cc, apt-pkg/pkgcache.cc:
+ - ignore "self"-conflicts for all architectures of a package
+ instead of just for the architecture of the package look at
+ in the ordering of installations, too (LP: #802901)
+ - M-A:same lockstep unpack should operate on installed
+ packages first (LP: #835625)
+ * test/*
+ - reorganize the various testcases and helper we have and
+ integrate them better into the buildsystem
+ - run the test/libapt testcases at package build-time
+ * debian/apt.symbols:
+ - add the newly added symbols since 0.8.15.3
+ * cmdline/apt-get.cc:
+ - remove the binary caches in 'apt-get clean' as it is the first
+ thing recommend by many supporters in case of APT segfaults
+ - remove the caches in 'apt-get update', too, as they will be
+ invalid in most cases anyway
+ * apt-pkg/acquire-item.cc:
+ - if no Release.gpg file is found try to verify with hashes,
+ but do not fail if a hash can't be found
+ * apt-pkg/acquire.cc:
+ - non-existing directories are by definition clean
+ * cmdline/apt-key:
+ - if command is 'add' do not error out if the specified
+ keyring doesn't exist, it will be created by gpg
+ * apt-pkg/orderlist.cc:
+ - prefer visiting packages marked for deletion in VisitProvides
+ if we are operating on a negative dependency so that we can
+ deal early with the fallout of this remove
+ * apt-pkg/indexrecords.cc:
+ - fix Acquire::Max-ValidTime option by interpreting it really
+ as seconds as specified in the manpage and not as days
+ - add an Acquire::Min-ValidTime option (Closes: #640122)
+ * doc/apt.conf.5.xml:
+ - reword Acquire::Max-ValidTime documentation to make clear
+ that it doesn't provide the new Min-ValidTime functionality
+
+ -- Michael Vogt <mvo@debian.org> Mon, 12 Sep 2011 16:38:46 +0200
+
apt (0.8.15.6) unstable; urgency=low
[ Michael Vogt ]
diff --git a/debian/control b/debian/control
index f78d78bd8..150c56829 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Description: APT's commandline package manager
* apt-config as an interface to the configuration settings
* apt-key as an interface to manage authentication keys
-Package: libapt-pkg4.11
+Package: libapt-pkg4.12
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: APT's package managment runtime library
@@ -56,7 +56,7 @@ Description: APT's package managment runtime library
http, rsh as well as an interface to add more transports like
https (apt-transport-https) and debtorrent (apt-transport-debtorrent).
-Package: libapt-inst1.3
+Package: libapt-inst1.4
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: APT's deb package format runtime library
diff --git a/debian/libapt-inst1.3.install b/debian/libapt-inst1.4.install
index b7b63be81..b7b63be81 100644
--- a/debian/libapt-inst1.3.install
+++ b/debian/libapt-inst1.4.install
diff --git a/debian/libapt-inst1.3.symbols b/debian/libapt-inst1.4.symbols
index 1a46ba1a9..bba2cb653 100644
--- a/debian/libapt-inst1.3.symbols
+++ b/debian/libapt-inst1.4.symbols
@@ -1,4 +1,4 @@
-libapt-inst.so.1.3 libapt-inst1.3 #MINVER#
+libapt-inst.so.1.4 libapt-inst1.4 #MINVER#
* Build-Depends-Package: libapt-pkg-dev
(c++)"ExtractTar::Done(bool)@Base" 0.8.0
(c++)"ExtractTar::Go(pkgDirStream&)@Base" 0.8.0
diff --git a/debian/libapt-pkg4.11.install b/debian/libapt-pkg4.12.install
index 91b39a31b..91b39a31b 100644
--- a/debian/libapt-pkg4.11.install
+++ b/debian/libapt-pkg4.12.install
diff --git a/debian/libapt-pkg4.11.symbols b/debian/libapt-pkg4.12.symbols
index ce598e7b3..8d2bc4a54 100644
--- a/debian/libapt-pkg4.11.symbols
+++ b/debian/libapt-pkg4.12.symbols
@@ -1,4 +1,4 @@
-libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
+libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER#
* Build-Depends-Package: libapt-pkg-dev
TFRewritePackageOrder@Base 0.8.0
TFRewriteSourceOrder@Base 0.8.0
@@ -60,7 +60,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"WaitFd(int, bool, unsigned long)@Base" 0.8.0
(c++)"GetLock(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, bool)@Base" 0.8.0
(c++)"Hex2Num(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned char*, unsigned int)@Base" 0.8.0
- (c++)"AddCRC16(unsigned short, void const*, unsigned long)@Base" 0.8.0
(c++)"CopyFile(FileFd&, FileFd&)@Base" 0.8.0
(c++)"ExecFork()@Base" 0.8.0
(c++)"ExecWait(int, char const*, bool)@Base" 0.8.0
@@ -97,25 +96,18 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"HashString::HashString()@Base" 0.8.0
(c++)"HashString::~HashString()@Base" 0.8.0
(c++)"OpProgress::CheckChange(float)@Base" 0.8.0
- (c++)"OpProgress::SubProgress(unsigned long)@Base" 0.8.0
- (c++)"OpProgress::SubProgress(unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
- (c++)"OpProgress::OverallProgress(unsigned long, unsigned long, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
(c++)"OpProgress::Done()@Base" 0.8.0
(c++)"OpProgress::Update()@Base" 0.8.0
- (c++)"OpProgress::Progress(unsigned long)@Base" 0.8.0
(c++)"OpProgress::OpProgress()@Base" 0.8.0
(c++)"OpProgress::~OpProgress()@Base" 0.8.0
(c++)"SourceCopy::GetFileName()@Base" 0.8.0
(c++)"SourceCopy::RewriteEntry(_IO_FILE*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
(c++)"SourceCopy::Type()@Base" 0.8.0
- (c++)"SourceCopy::GetFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long&)@Base" 0.8.0
(c++)"SourceCopy::~SourceCopy()@Base" 0.8.0
(c++)"pkgAcqFile::Custom600Headers()@Base" 0.8.0
- (c++)"pkgAcqFile::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqFile::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqFile::DescURI()@Base" 0.8.0
(c++)"pkgAcqFile::HashSum()@Base" 0.8.0
- (c++)"pkgAcqFile::pkgAcqFile(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.0
(c++)"pkgAcqFile::~pkgAcqFile()@Base" 0.8.0
(c++)"pkgAcquire::WorkerStep(pkgAcquire::Worker*)@Base" 0.8.0
(c++)"pkgAcquire::FetchNeeded()@Base" 0.8.0
@@ -128,8 +120,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"pkgAcquire::Bump()@Base" 0.8.0
(c++)"pkgAcquire::Item::Custom600Headers()@Base" 0.8.0
(c++)"pkgAcquire::Item::ReportMirrorFailure(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"pkgAcquire::Item::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
- (c++)"pkgAcquire::Item::Start(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long)@Base" 0.8.0
(c++)"pkgAcquire::Item::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcquire::Item::Rename(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
(c++)"pkgAcquire::Item::HashSum()@Base" 0.8.0
@@ -199,10 +189,8 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"pkgRecords::pkgRecords(pkgCache&)@Base" 0.8.0
(c++)"pkgRecords::~pkgRecords()@Base" 0.8.0
(c++)"pkgTagFile::Fill()@Base" 0.8.0
- (c++)"pkgTagFile::Jump(pkgTagSection&, unsigned long)@Base" 0.8.0
(c++)"pkgTagFile::Step(pkgTagSection&)@Base" 0.8.0
(c++)"pkgTagFile::Resize()@Base" 0.8.0
- (c++)"pkgTagFile::pkgTagFile(FileFd*, unsigned long)@Base" 0.8.0
(c++)"pkgTagFile::~pkgTagFile()@Base" 0.8.0
(c++)"CdromDevice::~CdromDevice()@Base" 0.8.0
(c++)"CommandLine::DispatchArg(CommandLine::Dispatch*, bool)@Base" 0.8.0
@@ -211,7 +199,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"CommandLine::HandleOpt(int&, int, char const**, char const*&, CommandLine::Args*, bool)@Base" 0.8.0
(c++)"CommandLine::CommandLine(CommandLine::Args*, Configuration*)@Base" 0.8.0
(c++)"CommandLine::~CommandLine()@Base" 0.8.0
- (c++)"DynamicMMap::RawAllocate(unsigned long, unsigned long)@Base" 0.8.0
(c++)"DynamicMMap::WriteString(char const*, unsigned long)@Base" 0.8.0
(c++)"DynamicMMap::Grow()@Base" 0.8.0
(c++)"DynamicMMap::Allocate(unsigned long)@Base" 0.8.0
@@ -237,16 +224,11 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"GlobalError::Warning(char const*, ...)@Base" 0.8.0
(c++)"GlobalError::WarningE(char const*, char const*, ...)@Base" 0.8.0
(c++)"GlobalError::GlobalError()@Base" 0.8.0
- (c++)"MD5SumValue::Set(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"MD5SumValue::MD5SumValue(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"MD5SumValue::MD5SumValue()@Base" 0.8.0
(c++)"PackageCopy::GetFileName()@Base" 0.8.0
(c++)"PackageCopy::RewriteEntry(_IO_FILE*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
(c++)"PackageCopy::Type()@Base" 0.8.0
- (c++)"PackageCopy::GetFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long&)@Base" 0.8.0
(c++)"PackageCopy::~PackageCopy()@Base" 0.8.0
(c++)"pkgAcqIndex::Custom600Headers()@Base" 0.8.0
- (c++)"pkgAcqIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqIndex::DescURI()@Base" 0.8.0
(c++)"pkgAcqIndex::HashSum()@Base" 0.8.0
@@ -285,12 +267,9 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"pkgDepCache::Update(pkgCache::DepIterator)@Base" 0.8.0
(c++)"pkgDepCache::Update(OpProgress*)@Base" 0.8.0
(c++)"pkgDepCache::Update(pkgCache::PkgIterator const&)@Base" 0.8.0
- (c++)"pkgDepCache::AddSizes(pkgCache::PkgIterator const&, bool const&)@Base" 0.8.0
- (c++)"pkgDepCache::AddSizes(pkgCache::PkgIterator const&, long)@Base" 0.8.0
(c++)"pkgDepCache::CheckDep(pkgCache::DepIterator, int, pkgCache::PkgIterator&)@Base" 0.8.0
(c++)"pkgDepCache::MarkAuto(pkgCache::PkgIterator const&, bool)@Base" 0.8.0
(c++)"pkgDepCache::MarkKeep(pkgCache::PkgIterator const&, bool, bool, unsigned long)@Base" 0.8.0
- (c++)"pkgDepCache::AddStates(pkgCache::PkgIterator const&, int)@Base" 0.8.0
(c++)"pkgDepCache::pkgDepCache(pkgCache*, pkgDepCache::Policy*)@Base" 0.8.0
(c++)"pkgDepCache::~pkgDepCache()@Base" 0.8.0
(c++)"pkgSimulate::ShortBreaks()@Base" 0.8.0
@@ -302,13 +281,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"pkgSimulate::Configure(pkgCache::PkgIterator)@Base" 0.8.0
(c++)"pkgSimulate::pkgSimulate(pkgDepCache*)@Base" 0.8.0
(c++)"pkgSimulate::~pkgSimulate()@Base" 0.8.0
- (c++)"MD5Summation::Add(unsigned char const*, unsigned long)@Base" 0.8.0
- (c++)"MD5Summation::AddFD(int, unsigned long)@Base" 0.8.0
- (c++)"MD5Summation::Result()@Base" 0.8.0
- (c++)"MD5Summation::MD5Summation()@Base" 0.8.0
- (c++)"SHA1SumValue::Set(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"SHA1SumValue::SHA1SumValue(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"SHA1SumValue::SHA1SumValue()@Base" 0.8.0
(c++)"debIFTypePkg::~debIFTypePkg()@Base" 0.8.0
(c++)"debIFTypeSrc::~debIFTypeSrc()@Base" 0.8.0
(c++)"debSLTypeDeb::~debSLTypeDeb()@Base" 0.8.0
@@ -373,7 +345,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"pkgOrderList::DepRemove(pkgCache::DepIterator)@Base" 0.8.0
(c++)"pkgOrderList::IsMissing(pkgCache::PkgIterator)@Base" 0.8.0
(c++)"pkgOrderList::VisitDeps(bool (pkgOrderList::*)(pkgCache::DepIterator), pkgCache::PkgIterator)@Base" 0.8.0
- (c++)"pkgOrderList::VisitNode(pkgCache::PkgIterator)@Base" 0.8.0
(c++)"pkgOrderList::WipeFlags(unsigned long)@Base" 0.8.0
(c++)"pkgOrderList::pkgOrderList(pkgDepCache*)@Base" 0.8.0
(c++)"pkgOrderList::~pkgOrderList()@Base" 0.8.0
@@ -391,10 +362,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"Configuration::Configuration(Configuration::Item const*)@Base" 0.8.0
(c++)"Configuration::Configuration()@Base" 0.8.0
(c++)"Configuration::~Configuration()@Base" 0.8.0
- (c++)"SHA1Summation::Add(unsigned char const*, unsigned long)@Base" 0.8.0
- (c++)"SHA1Summation::AddFD(int, unsigned long)@Base" 0.8.0
- (c++)"SHA1Summation::Result()@Base" 0.8.0
- (c++)"SHA1Summation::SHA1Summation()@Base" 0.8.0
(c++)"WeakPointable::~WeakPointable()@Base" 0.8.0
(c++)"debListParser::NewVersion(pkgCache::VerIterator&)@Base" 0.8.0
(c++)"debListParser::UsePackage(pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.0
@@ -420,7 +387,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"debListParser::GrabWord(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, debListParser::WordList*, unsigned char&)@Base" 0.8.0
(c++)"debListParser::debListParser(FileFd*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
(c++)"debListParser::~debListParser()@Base" 0.8.0
- (c++)"pkgAcqArchive::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqArchive::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqArchive::DescURI()@Base" 0.8.0
(c++)"pkgAcqArchive::HashSum()@Base" 0.8.0
@@ -431,7 +397,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"pkgAcqArchive::pkgAcqArchive(pkgAcquire*, pkgSourceList*, pkgRecords*, pkgCache::VerIterator const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.0
(c++)"pkgAcqArchive::~pkgAcqArchive()@Base" 0.8.0
(c++)"pkgAcqMetaSig::Custom600Headers()@Base" 0.8.0
- (c++)"pkgAcqMetaSig::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqMetaSig::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqMetaSig::DescURI()@Base" 0.8.0
(c++)"pkgAcqMetaSig::~pkgAcqMetaSig()@Base" 0.8.0
@@ -470,16 +435,9 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"OpTextProgress::Update()@Base" 0.8.0
(c++)"OpTextProgress::OpTextProgress(Configuration&)@Base" 0.8.0
(c++)"OpTextProgress::~OpTextProgress()@Base" 0.8.0
- (c++)"SHA256SumValue::Set(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"SHA256SumValue::SHA256SumValue(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"SHA256SumValue::SHA256SumValue()@Base" 0.8.0
(c++)"debIFTypeTrans::~debIFTypeTrans()@Base" 0.8.0
(c++)"debStatusIndex::debStatusIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
(c++)"debStatusIndex::~debStatusIndex()@Base" 0.8.0
- (c++)"SHA256Summation::Add(unsigned char const*, unsigned long)@Base" 0.8.0
- (c++)"SHA256Summation::AddFD(int, unsigned long)@Base" 0.8.0
- (c++)"SHA256Summation::Result()@Base" 0.8.0
- (c++)"SHA256Summation::SHA256Summation()@Base" 0.8.0
(c++)"debIFTypeStatus::~debIFTypeStatus()@Base" 0.8.0
(c++)"debRecordParser::Maintainer()@Base" 0.8.0
(c++)"debRecordParser::SHA256Hash()@Base" 0.8.0
@@ -510,7 +468,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"debSourcesIndex::~debSourcesIndex()@Base" 0.8.0
(c++)"pkgAcqDiffIndex::ParseDiffIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
(c++)"pkgAcqDiffIndex::Custom600Headers()@Base" 0.8.0
- (c++)"pkgAcqDiffIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqDiffIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqDiffIndex::DescURI()@Base" 0.8.0
(c++)"pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, HashString)@Base" 0.8.0
@@ -519,7 +476,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"pkgAcqMetaIndex::VerifyVendor(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
(c++)"pkgAcqMetaIndex::RetrievalDone(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
(c++)"pkgAcqMetaIndex::Custom600Headers()@Base" 0.8.0
- (c++)"pkgAcqMetaIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqMetaIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqMetaIndex::DescURI()@Base" 0.8.0
(c++)"pkgAcqMetaIndex::AuthDone(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
@@ -536,7 +492,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"debPackagesIndex::debPackagesIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
(c++)"debPackagesIndex::~debPackagesIndex()@Base" 0.8.0
(c++)"pkgAcqIndexDiffs::QueueNextDiff()@Base" 0.8.0
- (c++)"pkgAcqIndexDiffs::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqIndexDiffs::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqIndexDiffs::Finish(bool)@Base" 0.8.0
(c++)"pkgAcqIndexDiffs::DescURI()@Base" 0.8.0
@@ -553,7 +508,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"pkgAcquireStatus::Pulse(pkgAcquire*)@Base" 0.8.0
(c++)"pkgAcquireStatus::Start()@Base" 0.8.0
(c++)"pkgAcquireStatus::IMSHit(pkgAcquire::ItemDesc&)@Base" 0.8.0
- (c++)"pkgAcquireStatus::Fetched(unsigned long, unsigned long)@Base" 0.8.0
(c++)"pkgAcquireStatus::pkgAcquireStatus()@Base" 0.8.0
(c++)"pkgAcquireStatus::~pkgAcquireStatus()@Base" 0.8.0
(c++)"PreferenceSection::TrimRecord(bool, char const*&)@Base" 0.8.0
@@ -562,7 +516,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
(c++)"pkgCacheGenerator::ListParser::CollectFileProvides(pkgCache&, pkgCache::VerIterator&)@Base" 0.8.0
(c++)"pkgCacheGenerator::ListParser::~ListParser()@Base" 0.8.0
- (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int const&, unsigned int const&, unsigned int*)@Base" 0.8.0
(c++)"pkgCacheGenerator::NewFileVer(pkgCache::VerIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0
(c++)"pkgCacheGenerator::NewPackage(pkgCache::PkgIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
(c++)"pkgCacheGenerator::NewVersion(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned long)@Base" 0.8.0
@@ -570,7 +523,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"pkgCacheGenerator::FinishCache(OpProgress*)@Base" 0.8.0
(c++)"pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0
(c++)"pkgCacheGenerator::AllocateInMap(unsigned long const&)@Base" 0.8.0
- (c++)"pkgCacheGenerator::NewDescription(pkgCache::DescIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, MD5SumValue const&, unsigned int)@Base" 0.8.0
(c++)"pkgCacheGenerator::MakeStatusCache(pkgSourceList&, OpProgress*, MMap**, bool)@Base" 0.8.0
(c++)"pkgCacheGenerator::WriteUniqString(char const*, unsigned int)@Base" 0.8.0
(c++)"pkgCacheGenerator::WriteStringInMap(char const*)@Base" 0.8.0
@@ -699,17 +651,11 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"MMap::~MMap()@Base" 0.8.0
(c++)"FileFd::OpenDescriptor(int, FileFd::OpenMode, bool)@Base" 0.8.0
(c++)"FileFd::Open(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, FileFd::OpenMode, unsigned long)@Base" 0.8.0
- (c++)"FileFd::Read(void*, unsigned long, unsigned long*)@Base" 0.8.0
- (c++)"FileFd::Seek(unsigned long)@Base" 0.8.0
(c++)"FileFd::Size()@Base" 0.8.0
- (c++)"FileFd::Skip(unsigned long)@Base" 0.8.0
(c++)"FileFd::Sync()@Base" 0.8.0
(c++)"FileFd::Tell()@Base" 0.8.0
(c++)"FileFd::Close()@Base" 0.8.0
- (c++)"FileFd::Write(void const*, unsigned long)@Base" 0.8.0
- (c++)"FileFd::Truncate(unsigned long)@Base" 0.8.0
(c++)"FileFd::~FileFd()@Base" 0.8.0
- (c++)"Hashes::AddFD(int, unsigned long)@Base" 0.8.0
(c++)"Vendor::CheckDist(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
(c++)"Vendor::Vendor(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<Vendor::Fingerprint*, std::allocator<Vendor::Fingerprint*> >*)@Base" 0.8.0
(c++)"Vendor::~Vendor()@Base" 0.8.0
@@ -797,7 +743,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"pkgDPkgPM::~pkgDPkgPM()@Base" 0.8.0
(c++)"pkgPolicy::GetPriority(pkgCache::PkgIterator const&)@Base" 0.8.0
(c++)"pkgPolicy::InitDefaults()@Base" 0.8.0
- (c++)"pkgPolicy::IsImportantDep(pkgCache::DepIterator const&)@Base" 0.8.0
(c++)"pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const&)@Base" 0.8.0
(c++)"pkgPolicy::PkgPin::~PkgPin()@Base" 0.8.0
(c++)"pkgPolicy::GetMatch(pkgCache::PkgIterator const&)@Base" 0.8.0
@@ -816,10 +761,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"HashString::toStr() const@Base" 0.8.0
(c++)"CommandLine::FileSize() const@Base" 0.8.0
(c++)"GlobalError::empty(GlobalError::MsgType const&) const@Base" 0.8.0
- (c++)"MD5SumValue::Value() const@Base" 0.8.0
- (c++)"MD5SumValue::operator==(MD5SumValue const&) const@Base" 0.8.0
- (c++)"SHA1SumValue::Value() const@Base" 0.8.0
- (c++)"SHA1SumValue::operator==(SHA1SumValue const&) const@Base" 0.8.0
(c++)"debIFTypePkg::CreatePkgParser(pkgCache::PkgFileIterator) const@Base" 0.8.0
(c++)"debSLTypeDeb::CreateItem(std::vector<metaIndex*, std::allocator<metaIndex*> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&) const@Base" 0.8.0
(c++)"indexRecords::GetValidUntil() const@Base" 0.8.0
@@ -858,8 +799,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"pkgTagSection::FindS(char const*) const@Base" 0.8.0
(c++)"pkgTagSection::FindULL(char const*, unsigned long long const&) const@Base" 0.8.0
(c++)"pkgTagSection::FindFlag(char const*, unsigned long&, unsigned long) const@Base" 0.8.0
- (c++)"SHA256SumValue::Value() const@Base" 0.8.0
- (c++)"SHA256SumValue::operator==(SHA256SumValue const&) const@Base" 0.8.0
(c++)"debStatusIndex::FindInCache(pkgCache&) const@Base" 0.8.0
(c++)"debStatusIndex::HasPackages() const@Base" 0.8.0
(c++)"debStatusIndex::Size() const@Base" 0.8.0
@@ -938,7 +877,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"pkgCache::VerIterator::Downloadable() const@Base" 0.8.0
(c++)"pkgCache::VerIterator::OwnerPointer() const@Base" 0.8.0
(c++)"pkgCache::VerIterator::TranslatedDescription() const@Base" 0.8.0
- (c++)"pkgCache::VerIterator::Pseudo() const@Base" 0.8.0
(c++)"pkgCache::VerIterator::RelStr() const@Base" 0.8.0
(c++)"pkgCache::VerIterator::Automatic() const@Base" 0.8.0
(c++)"pkgCache::DescIterator::OwnerPointer() const@Base" 0.8.0
@@ -1255,7 +1193,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(arch=hppa mips mipsel sparc|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned int&)@Base" 0.8.11.4
(arch=ia64 sparc64|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned long&)@Base" 0.8.11.4
(arch=sh4|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __builtin_va_list&, unsigned int&)@Base" 0.8.11.4
-
(arch=i386 hurd-i386 kfreebsd-i386|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned int&)@Base" 0.8.11.4
(arch=armel armhf|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, std::__va_list&, int, unsigned int&)@Base" 0.8.11.4
(arch=alpha|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag&, int, unsigned long&)@Base" 0.8.11.4
@@ -1267,8 +1204,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
### architecture specific: size_t
(arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mips mipsel powerpc powerpcspe sh4 sparc|c++)"_strtabexpand(char*, unsigned int)@Base" 0.8.0
(arch=alpha amd64 ia64 kfreebsd-amd64 s390 sparc64|c++)"_strtabexpand(char*, unsigned long)@Base" 0.8.0
- (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mips mipsel powerpc powerpcspe sh4 sparc|c++)"indexRecords::parseSumData(char const*&, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&)@Base" 0.8.0
- (arch=alpha amd64 ia64 kfreebsd-amd64 s390 sparc64|c++)"indexRecords::parseSumData(char const*&, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long&)@Base" 0.8.0
### try to ignore std:: template instances
(c++|regex|optional=std)"^(void |)std::[^ ]+<.+ >::(_|~).+\(.*\)@Base$" 0.8.0
(c++|regex|optional=std)"^std::[^ ]+<.+ >::(append|insert|reserve|operator[^ ]+)\(.*\)@Base$" 0.8.0
@@ -1294,7 +1229,6 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"pkgTagSection::FindFlag(unsigned long&, unsigned long, char const*, char const*)@Base" 0.8.11
(c++)"pkgAcqSubIndex::ParseIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11
(c++)"pkgAcqSubIndex::Custom600Headers()@Base" 0.8.11
- (c++)"pkgAcqSubIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11
(c++)"pkgAcqSubIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11
(c++)"pkgAcqSubIndex::DescURI()@Base" 0.8.11
(c++)"pkgAcqSubIndex::pkgAcqSubIndex(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, HashString const&)@Base" 0.8.11
@@ -1320,10 +1254,194 @@ libapt-pkg.so.4.11 libapt-pkg4.11 #MINVER#
(c++)"APT::Configuration::getCompressors(bool)@Base" 0.8.12
(c++)"APT::Configuration::getCompressorExtensions()@Base" 0.8.12
(c++)"APT::Configuration::setDefaultConfigurationForCompressors()@Base" 0.8.12
- (c++)"pkgDepCache::SetCandidateVersion(pkgCache::VerIterator, bool const&)@Base" 0.8.12
(c++)"pkgAcqMetaClearSig::Custom600Headers()@Base" 0.8.13
(c++|optional=private)"debListParser::NewProvidesAllArch(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.13.2
(c++|optional=private)"PrintMode(char)@Base" 0.8.13.2
(c++)"pkgDepCache::IsModeChangeOk(pkgDepCache::ModeList, pkgCache::PkgIterator const&, unsigned long, bool)@Base" 0.8.13.2
(c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool)@Base" 0.8.15~exp1
(c++)"pkgCache::DepIterator::IsNegative() const@Base" 0.8.15~exp1
+ (c++)"Configuration::CndSet(char const*, int)@Base" 0.8.15.3
+ (c++)"pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator)@Base" 0.8.15.3
+ (c++)"DeEscapeString(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.15.4
+ (c++)"GetModificationTime(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.15.6
+ (c++)"pkgSourceList::GetLastModifiedTime()@Base" 0.8.15.6
+ (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int const&, unsigned int const&, unsigned int*&)@Base" 0.8.15.6
+ (c++)"pkgCacheFile::RemoveCaches()@Base" 0.8.15.7
+ (c++)"pkgOrderList::VisitNode(pkgCache::PkgIterator, char const*)@Base" 0.8.15.7
+### external dependency resolver ###
+ (c++)"edspIFType::~edspIFType()@Base" 0.8.16~exp2
+ (c++)"edspSystem::Initialize(Configuration&)@Base" 0.8.16~exp2
+ (c++)"edspSystem::AddStatusFiles(std::vector<pkgIndexFile*, std::allocator<pkgIndexFile*> >&)@Base" 0.8.16~exp2
+ (c++)"edspSystem::ArchiveSupported(char const*)@Base" 0.8.16~exp2
+ (c++)"edspSystem::Lock()@Base" 0.8.16~exp2
+ (c++)"edspSystem::Score(Configuration const&)@Base" 0.8.16~exp2
+ (c++)"edspSystem::UnLock(bool)@Base" 0.8.16~exp2
+ (c++)"edspSystem::edspSystem()@Base" 0.8.16~exp2
+ (c++)"edspSystem::~edspSystem()@Base" 0.8.16~exp2
+ (c++)"edspListParser::NewVersion(pkgCache::VerIterator&)@Base" 0.8.16~exp2
+ (c++)"edspListParser::Description()@Base" 0.8.16~exp2
+ (c++)"edspListParser::ParseStatus(pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.16~exp2
+ (c++)"edspListParser::VersionHash()@Base" 0.8.16~exp2
+ (c++)"edspListParser::Description_md5()@Base" 0.8.16~exp2
+ (c++)"edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator&, FileFd&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.16~exp2
+ (c++)"edspListParser::DescriptionLanguage()@Base" 0.8.16~exp2
+ (c++)"edspListParser::edspListParser(FileFd*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp2
+ (c++)"edspListParser::~edspListParser()@Base" 0.8.16~exp2
+ (c++)"edspIndex::edspIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.16~exp2
+ (c++)"edspIndex::~edspIndex()@Base" 0.8.16~exp2
+ (c++)"edspIFType::CreatePkgParser(pkgCache::PkgFileIterator) const@Base" 0.8.16~exp2
+ (c++)"edspSystem::CreatePM(pkgDepCache*) const@Base" 0.8.16~exp2
+ (c++)"edspSystem::FindIndex(pkgCache::PkgFileIterator, pkgIndexFile*&) const@Base" 0.8.16~exp2
+ (c++)"edspIndex::Merge(pkgCacheGenerator&, OpProgress*) const@Base" 0.8.16~exp2
+ (c++)"edspIndex::GetType() const@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteError(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, _IO_FILE*)@Base" 0.8.16~exp2
+ (c++)"EDSP::ReadRequest(int, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, bool&, bool&, bool&)@Base" 0.8.16~exp2
+ (c++)"EDSP::ApplyRequest(std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, pkgDepCache&)@Base" 0.8.16~exp2
+ (c++)"EDSP::ReadResponse(int, pkgDepCache&, OpProgress*)@Base" 0.8.16~exp2
+ (c++)"EDSP::StringToBool(char const*, bool)@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteRequest(pkgDepCache&, _IO_FILE*, bool, bool, bool, OpProgress*)@Base" 0.8.16~exp2
+ (c++)"EDSP::ExecuteSolver(char const*, int*, int*)@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteProgress(unsigned short, char const*, _IO_FILE*)@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteScenario(pkgDepCache&, _IO_FILE*, OpProgress*)@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteSolution(pkgDepCache&, _IO_FILE*)@Base" 0.8.16~exp2
+ (c++)"EDSP::ResolveExternal(char const*, pkgDepCache&, bool, bool, bool, OpProgress*)@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageSet const&, OpProgress*)@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteScenarioVersion(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&)@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteScenarioDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&)@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageSet const&)@Base" 0.8.16~exp2
+ (c++)"EDSP::DepMap@Base" 0.8.16~exp2
+ (c++)"EDSP::PrioMap@Base" 0.8.16~exp2
+ (c++)"EDSP::ReadLine(int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.16~exp2
+ (c++)"pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const&)@Base" 0.8.16~exp6
+ (c++)"pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const&)@Base" 0.8.16~exp6
+ (c++)"typeinfo for edspIFType@Base" 0.8.16~exp2
+ (c++)"typeinfo for edspSystem@Base" 0.8.16~exp2
+ (c++)"typeinfo for edspListParser@Base" 0.8.16~exp2
+ (c++)"typeinfo for edspIndex@Base" 0.8.16~exp2
+ (c++)"typeinfo name for edspIFType@Base" 0.8.16~exp2
+ (c++)"typeinfo name for edspSystem@Base" 0.8.16~exp2
+ (c++)"typeinfo name for edspListParser@Base" 0.8.16~exp2
+ (c++)"typeinfo name for edspIndex@Base" 0.8.16~exp2
+ (c++)"vtable for edspIFType@Base" 0.8.16~exp2
+ (c++)"vtable for edspSystem@Base" 0.8.16~exp2
+ (c++)"vtable for edspListParser@Base" 0.8.16~exp2
+ (c++)"vtable for edspIndex@Base" 0.8.16~exp2
+ edspSys@Base 0.8.16~exp2
+### generalisation of checksums (with lfs) -- mostly api-compatible available (without sha512 in previous versions)
+ (c++)"SHA256_End(_SHA256_CTX*, char*)@Base" 0.8.16~exp2
+ (c++)"SHA384_End(_SHA512_CTX*, char*)@Base" 0.8.16~exp2
+ (c++)"SHA512_End(_SHA512_CTX*, char*)@Base" 0.8.16~exp2
+ (c++)"SHA256_Data(unsigned char const*, unsigned int, char*)@Base" 0.8.16~exp2
+ (c++)"SHA256_Init(_SHA256_CTX*)@Base" 0.8.16~exp2
+ (c++)"SHA384_Data(unsigned char const*, unsigned int, char*)@Base" 0.8.16~exp2
+ (c++)"SHA384_Init(_SHA512_CTX*)@Base" 0.8.16~exp2
+ (c++)"SHA512_Data(unsigned char const*, unsigned int, char*)@Base" 0.8.16~exp2
+ (c++)"SHA512_Init(_SHA512_CTX*)@Base" 0.8.16~exp2
+ (c++)"SHA256_Final(unsigned char*, _SHA256_CTX*)@Base" 0.8.16~exp2
+ (c++)"SHA384_Final(unsigned char*, _SHA512_CTX*)@Base" 0.8.16~exp2
+ (c++)"SHA512_Final(unsigned char*, _SHA512_CTX*)@Base" 0.8.16~exp2
+ (c++)"SHA256_Update(_SHA256_CTX*, unsigned char const*, unsigned int)@Base" 0.8.16~exp2
+ (c++)"SHA384_Update(_SHA512_CTX*, unsigned char const*, unsigned int)@Base" 0.8.16~exp2
+ (c++)"SHA512_Update(_SHA512_CTX*, unsigned char const*, unsigned int)@Base" 0.8.16~exp2
+ (c++)"AddCRC16(unsigned short, void const*, unsigned long long)@Base" 0.8.16~exp2
+ (c++)"MD5Summation::Add(unsigned char const*, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"MD5Summation::Result()@Base" 0.8.16~exp2
+ (c++)"MD5Summation::MD5Summation()@Base" 0.8.16~exp2
+ (c++)"SHA1Summation::SHA1Summation()@Base" 0.8.16~exp2
+ (c++)"SHA1Summation::Add(unsigned char const*, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"SHA1Summation::Result()@Base" 0.8.16~exp2
+ (c++)"SHA256Summation::Add(unsigned char const*, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"SHA512Summation::Add(unsigned char const*, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"debRecordParser::SHA512Hash()@Base" 0.8.16~exp2
+ (c++)"pkgRecords::Parser::SHA512Hash()@Base" 0.8.16~exp6
+ (c++)"Hashes::AddFD(int, unsigned long long, bool, bool, bool, bool)@Base" 0.8.16~exp6
+ (c++)"SummationImplementation::AddFD(int, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"typeinfo for MD5Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo for SHA1Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo for SHA256Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo for SHA512Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo for SHA2SummationBase@Base" 0.8.16~exp6
+ (c++)"typeinfo for SummationImplementation@Base" 0.8.16~exp6
+ (c++)"typeinfo name for MD5Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo name for SHA1Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo name for SHA256Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo name for SHA512Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo name for SHA2SummationBase@Base" 0.8.16~exp6
+ (c++)"typeinfo name for SummationImplementation@Base" 0.8.16~exp6
+ (c++)"vtable for MD5Summation@Base" 0.8.16~exp6
+ (c++)"vtable for SHA1Summation@Base" 0.8.16~exp6
+ (c++)"vtable for SHA256Summation@Base" 0.8.16~exp6
+ (c++)"vtable for SHA512Summation@Base" 0.8.16~exp6
+ (c++)"vtable for SHA2SummationBase@Base" 0.8.16~exp6
+ (c++)"vtable for SummationImplementation@Base" 0.8.16~exp6
+### large file support - available in older api-compatible versions without lfs ###
+ (c++)"StrToNum(char const*, unsigned long long&, unsigned int, unsigned int)@Base" 0.8.16~exp6
+ (c++)"OpProgress::SubProgress(unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, float)@Base" 0.8.16~exp6
+ (c++)"OpProgress::OverallProgress(unsigned long long, unsigned long long, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp6
+ (c++)"OpProgress::Progress(unsigned long long)@Base" 0.8.16~exp6
+ (c++)"SourceCopy::GetFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long long&)@Base" 0.8.16~exp6
+ (c++)"pkgAcqFile::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"pkgAcqFile::pkgAcqFile(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.16~exp6
+ (c++)"pkgAcquire::UriIterator::~UriIterator()@Base" 0.8.16~exp6
+ (c++)"pkgAcquire::MethodConfig::~MethodConfig()@Base" 0.8.16~exp6
+ (c++)"pkgAcquire::Item::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"pkgAcquire::Item::Start(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"pkgRecords::Parser::RecordField(char const*)@Base" 0.8.16~exp6
+ (c++)"pkgTagFile::Jump(pkgTagSection&, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"pkgTagFile::Offset()@Base" 0.8.16~exp6
+ (c++)"pkgTagFile::pkgTagFile(FileFd*, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"DynamicMMap::RawAllocate(unsigned long long, unsigned long)@Base" 0.8.16~exp6
+ (c++)"PackageCopy::GetFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long long&)@Base" 0.8.16~exp6
+ (c++)"pkgAcqIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"indexRecords::parseSumData(char const*&, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long long&)@Base" 0.8.16~exp6
+ (c++)"pkgAcqArchive::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"pkgTagSection::~pkgTagSection()@Base" 0.8.16~exp6
+ (c++)"pkgAcqSubIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"debRecordParser::RecordField(char const*)@Base" 0.8.16~exp6
+ (c++)"debReleaseIndex::SetTrusted(bool)@Base" 0.8.16~exp6
+ (c++)"debReleaseIndex::debReleaseIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.16~exp6
+ (c++)"pkgAcqMetaIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"pkgAcqIndexDiffs::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"pkgAcqMetaSig::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"pkgAcqDiffIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"pkgAcquireStatus::Fetched(unsigned long long, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"PreferenceSection::~PreferenceSection()@Base" 0.8.16~exp6
+ (c++)"pkgCacheGenerator::NewDescription(pkgCache::DescIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, HashSumValue<128> const&, unsigned int)@Base" 0.8.16~exp6
+ (c++)"pkgProblemResolver::ResolveInternal(bool)@Base" 0.8.16~exp6
+ (c++)"pkgProblemResolver::ResolveByKeepInternal()@Base" 0.8.16~exp6
+ (c++)"FileFd::Read(void*, unsigned long long, unsigned long long*)@Base" 0.8.16~exp6
+ (c++)"FileFd::Seek(unsigned long long)@Base" 0.8.16~exp6
+ (c++)"FileFd::Skip(unsigned long long)@Base" 0.8.16~exp6
+ (c++)"FileFd::Write(void const*, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"FileFd::Truncate(unsigned long long)@Base" 0.8.16~exp6
+ (c++)"pkgCache::PkgIterator::PkgIterator(pkgCache&, pkgCache::Package*)@Base" 0.8.16~exp6
+ (c++)"pkgPolicy::GetPriority(pkgCache::PkgFileIterator const&)@Base" 0.8.16~exp6
+ (c++)"OptionalIndexTarget::IsOptional() const@Base" 0.8.16~exp6
+ (c++)"typeinfo for pkgTagFile@Base" 0.8.16~exp6
+ (c++)"typeinfo for IndexTarget@Base" 0.8.16~exp6
+ (c++)"typeinfo for pkgSrcRecords@Base" 0.8.16~exp6
+ (c++)"typeinfo for OptionalIndexTarget@Base" 0.8.16~exp6
+ (c++)"typeinfo for pkgAcquire::UriIterator@Base" 0.8.16~exp6
+ (c++)"typeinfo for pkgAcquire::MethodConfig@Base" 0.8.16~exp6
+ (c++)"typeinfo for pkgAcquire::Queue@Base" 0.8.16~exp6
+ (c++)"typeinfo for pkgAcquire::Worker@Base" 0.8.16~exp6
+ (c++)"typeinfo name for pkgTagFile@Base" 0.8.16~exp6
+ (c++)"typeinfo name for IndexTarget@Base" 0.8.16~exp6
+ (c++)"typeinfo name for pkgSrcRecords@Base" 0.8.16~exp6
+ (c++)"typeinfo name for OptionalIndexTarget@Base" 0.8.16~exp6
+ (c++)"typeinfo name for pkgAcquire::UriIterator@Base" 0.8.16~exp6
+ (c++)"typeinfo name for pkgAcquire::MethodConfig@Base" 0.8.16~exp6
+ (c++)"typeinfo name for pkgAcquire::Queue@Base" 0.8.16~exp6
+ (c++)"typeinfo name for pkgAcquire::Worker@Base" 0.8.16~exp6
+ (c++)"vtable for pkgTagFile@Base" 0.8.16~exp6
+ (c++)"vtable for IndexTarget@Base" 0.8.16~exp6
+ (c++)"vtable for pkgSrcRecords@Base" 0.8.16~exp6
+ (c++)"vtable for OptionalIndexTarget@Base" 0.8.16~exp6
+ (c++)"vtable for pkgAcquire::UriIterator@Base" 0.8.16~exp6
+ (c++)"vtable for pkgAcquire::MethodConfig@Base" 0.8.16~exp6
+ (c++)"vtable for pkgAcquire::Queue@Base" 0.8.16~exp6
+ (c++)"vtable for pkgAcquire::Worker@Base" 0.8.16~exp6
+### remove deprecated parameter
+ (c++)"pkgDepCache::SetCandidateVersion(pkgCache::VerIterator)@Base" 0.8.16~exp6
+ (c++)"pkgDepCache::AddSizes(pkgCache::PkgIterator const&, bool)@Base" 0.8.16~exp6
+ (c++)"pkgDepCache::AddStates(pkgCache::PkgIterator const&, bool)@Base" 0.8.16~exp6
diff --git a/debian/rules b/debian/rules
index 2cfd95b31..71019a746 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,7 +103,12 @@ build/build-stamp: build/configure-stamp
# compat symlink for the locale split
mkdir -p build/usr/share
cd build/usr/share && ln -f -s ../../locale .
- # done here
+ # compile and run tests
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+ $(MAKE) test
+else
+ @echo "Tests DISABLED"
+endif
touch $@
build/build-doc-stamp: build/configure-stamp
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 36a675bb0..03a418e5c 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -317,7 +317,7 @@
<varlistentry><term>autoremove</term>
<listitem><para><literal>autoremove</literal> is used to remove packages that were automatically
- installed to satisfy dependencies for some package and that are no more needed.</para></listitem>
+ installed to satisfy dependencies for other packages and are now no longer needed.</para></listitem>
</varlistentry>
<varlistentry><term>changelog</term>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 1adc868e0..d7d56f3a1 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -294,7 +294,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<para>Two sub-options to limit the use of PDiffs are also available:
With <literal>FileLimit</literal> can be specified how many PDiff files
are downloaded at most to patch a file. <literal>SizeLimit</literal>
- on the other hand is the maximum precentage of the size of all patches
+ on the other hand is the maximum percentage of the size of all patches
compared to the size of the targeted file. If one of these limits is
exceeded the complete file is downloaded instead of the patches.
</para></listitem>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index edab6f379..fff943e35 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: 2011-04-05 10:22+0300\n"
+"POT-Creation-Date: 2011-11-10 16:42+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -566,7 +566,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36
+#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121 apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36
msgid "Description"
msgstr ""
@@ -580,7 +580,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:120
+#: apt-cache.8.xml:70 apt-get.8.xml:127
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -944,7 +944,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126 apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
msgid "options"
msgstr ""
@@ -967,7 +967,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 apt-sortpkgs.1.xml:61
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404 apt-sortpkgs.1.xml:61
msgid "<option>-s</option>"
msgstr ""
@@ -987,12 +987,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>-q</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>--quiet</option>"
msgstr ""
@@ -1067,14 +1067,14 @@ msgstr ""
#: apt-cache.8.xml:317
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be twicked with these flags which will omit "
+"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: "
"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
"e.g. <literal>APT::Cache::ShowRecommends</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
+#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
msgid "<option>-f</option>"
msgstr ""
@@ -1091,7 +1091,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 apt-get.8.xml:452
msgid "<option>-a</option>"
msgstr ""
@@ -1187,12 +1187,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:596 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 apt.conf.5.xml:1093 apt_preferences.5.xml:654
+#: apt-cache.8.xml:372 apt-get.8.xml:601 apt-key.8.xml:175 apt-mark.8.xml:144 apt.conf.5.xml:1110 apt_preferences.5.xml:697
msgid "Files"
msgstr ""
@@ -1202,7 +1202,7 @@ msgid "&file-sourceslist; &file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661 sources.list.5.xml:234
+#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:611 apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704 sources.list.5.xml:255
msgid "See Also"
msgstr ""
@@ -1212,7 +1212,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:617 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr ""
@@ -1311,12 +1311,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:161
msgid "Options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
msgid "<option>-d</option>"
msgstr ""
@@ -1352,7 +1352,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:364
+#: apt-cdrom.8.xml:116 apt-get.8.xml:375
msgid "<option>-m</option>"
msgstr ""
@@ -1397,17 +1397,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:395
+#: apt-cdrom.8.xml:143 apt-get.8.xml:406
msgid "<option>--just-print</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:397
+#: apt-cdrom.8.xml:144 apt-get.8.xml:408
msgid "<option>--recon</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:398
+#: apt-cdrom.8.xml:145 apt-get.8.xml:409
msgid "<option>--no-act</option>"
msgstr ""
@@ -1519,7 +1519,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 apt-sortpkgs.1.xml:73
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 apt-sortpkgs.1.xml:73
msgid "&apt-conf;"
msgstr ""
@@ -1580,7 +1580,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
+#: apt-extracttemplates.1.xml:63 apt-get.8.xml:530
msgid "<option>-t</option>"
msgstr ""
@@ -1784,7 +1784,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:287
+#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
msgid "clean"
msgstr ""
@@ -2242,8 +2242,8 @@ msgid ""
"non-free</literal>"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
msgid "Architectures"
msgstr ""
@@ -2443,26 +2443,28 @@ msgid ""
"Configuration Items: "
"<literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and "
"<literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> "
-"where <literal>Index</literal> can be <literal>Packages</literal>, "
-"<literal>Sources</literal> or <literal>Release</literal> and "
-"<literal>Checksum</literal> can be <literal>MD5</literal>, "
-"<literal>SHA1</literal> or <literal>SHA256</literal>."
+"where <literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or "
+"<literal>Release</literal> and "
+"<literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or "
+"<literal>SHA256</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:539
+#: apt-ftparchive.1.xml:540
msgid "<option>--db</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:547
+#: apt-ftparchive.1.xml:548
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2471,12 +2473,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
msgid "<option>--delink</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:556
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -2485,12 +2487,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
msgid "<option>--contents</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -2500,12 +2502,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:571
+#: apt-ftparchive.1.xml:572
msgid "<option>--source-override</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: "
@@ -2513,24 +2515,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:578
msgid "<option>--readonly</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:580
msgid ""
"Make the caching databases read only. Configuration Item: "
"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:584
msgid "<option>--arch</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:585
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2539,12 +2541,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:590
+#: apt-ftparchive.1.xml:591
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -2558,12 +2560,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:602
+#: apt-ftparchive.1.xml:603
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:605
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2573,12 +2575,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501 sources.list.5.xml:198
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544 sources.list.5.xml:214
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
#, no-wrap
msgid ""
"<command>apt-ftparchive</command> packages "
@@ -2587,14 +2589,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:618
+#: apt-ftparchive.1.xml:619
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:632
+#: apt-ftparchive.1.xml:633
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -2625,7 +2627,9 @@ msgid ""
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
"<option>-t=</option> <arg choice='plain'> "
-"<replaceable>target_release</replaceable> </arg> </arg> <group "
+"<replaceable>target_release</replaceable> </arg> </arg> <arg> "
+"<option>-a=</option> <arg choice='plain'> "
+"<replaceable>default_architecture</replaceable> </arg> </arg> <group "
"choice=\"req\"> <arg choice='plain'>update</arg> <arg "
"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
@@ -2652,7 +2656,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:115
+#: apt-get.8.xml:122
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
@@ -2661,12 +2665,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:124 apt-key.8.xml:127
+#: apt-get.8.xml:131 apt-key.8.xml:127
msgid "update"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:132
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources. The indexes of available packages are fetched from the "
@@ -2681,12 +2685,12 @@ msgid ""
msgstr ""
#. type: <tag></tag>
-#: apt-get.8.xml:136 guide.sgml:121
+#: apt-get.8.xml:143 guide.sgml:121
msgid "upgrade"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:137
+#: apt-get.8.xml:144
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -2702,12 +2706,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:149
+#: apt-get.8.xml:156
msgid "dselect-upgrade"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:150
+#: apt-get.8.xml:157
msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, "
@@ -2718,12 +2722,12 @@ msgid ""
msgstr ""
#. type: <tag></tag>
-#: apt-get.8.xml:159 guide.sgml:140
+#: apt-get.8.xml:166 guide.sgml:140
msgid "dist-upgrade"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:167
msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -2737,12 +2741,12 @@ msgid ""
msgstr ""
#. type: <tag></tag>
-#: apt-get.8.xml:172 guide.sgml:131
+#: apt-get.8.xml:179 guide.sgml:131
msgid "install"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:181
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
@@ -2758,7 +2762,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:199
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -2769,14 +2773,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:206
msgid ""
"Both of the version selection mechanisms can downgrade packages and must be "
"used with care."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:202
+#: apt-get.8.xml:209
msgid ""
"This is also the target to use if you want to upgrade one or more "
"already-installed packages without upgrading every package you have on your "
@@ -2788,14 +2792,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:220
msgid ""
"Finally, the &apt-preferences; mechanism allows you to create an alternative "
"installation policy for individual packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:224
msgid ""
"If no package matches the given expression and the expression contains one "
"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -2807,12 +2811,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:233
msgid "remove"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:227
+#: apt-get.8.xml:234
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note the removing a package "
@@ -2822,12 +2826,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:241
msgid "purge"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:235
+#: apt-get.8.xml:242
msgid ""
"<literal>purge</literal> is identical to <literal>remove</literal> except "
"that packages are removed and purged (any configuration files are deleted "
@@ -2835,12 +2839,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:246
msgid "source"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:240
+#: apt-get.8.xml:247
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -2852,7 +2856,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:248
+#: apt-get.8.xml:255
msgid ""
"Source packages are tracked separately from binary packages via "
"<literal>deb-src</literal> type lines in the &sources-list; file. This means "
@@ -2863,16 +2867,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:262
msgid ""
"If the <option>--compile</option> option is specified then the package will "
-"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
-"<option>--download-only</option> is specified then the source package will "
-"not be unpacked."
+"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+"the architecture as defined by the <command>--host-architecture</command> "
+"option. If <option>--download-only</option> is specified then the source "
+"package will not be unpacked."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:260
+#: apt-get.8.xml:269
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -2882,7 +2887,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:275
msgid ""
"Note that source packages are not tracked like binary packages, they exist "
"only in the current directory and are similar to downloading source tar "
@@ -2890,43 +2895,46 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:280
msgid "build-dep"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:281
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
-"attempt to satisfy the build dependencies for a source package."
+"attempt to satisfy the build dependencies for a source package. By default "
+"the dependencies are satisfied to build the package nativly. If desired a "
+"host-architecture can be specified with the "
+"<option>--host-architecture</option> option instead."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:276
+#: apt-get.8.xml:287
msgid "check"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:288
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:292
msgid "download"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:293
msgid ""
"<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:299
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -2938,12 +2946,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid "autoclean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:298
+#: apt-get.8.xml:309
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -2955,25 +2963,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:307
+#: apt-get.8.xml:318
msgid "autoremove"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:319
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for some package and that "
-"are no more needed."
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:323
msgid "changelog"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:324
msgid ""
"<literal>changelog</literal> downloads a package changelog and displays it "
"through <command>sensible-pager</command>. The server name and base "
@@ -2986,48 +2994,48 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:335
+#: apt-get.8.xml:346
msgid "<option>--no-install-recommends</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:336
+#: apt-get.8.xml:347
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:340
+#: apt-get.8.xml:351
msgid "<option>--install-suggests</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:341
+#: apt-get.8.xml:352
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:356
msgid "<option>--download-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:357
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:350
+#: apt-get.8.xml:361
msgid "<option>--fix-broken</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:362
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -3043,17 +3051,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:375
msgid "<option>--ignore-missing</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:365
+#: apt-get.8.xml:376
msgid "<option>--fix-missing</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:366
+#: apt-get.8.xml:377
msgid ""
"Ignore missing packages; If packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -3065,12 +3073,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:387
msgid "<option>--no-download</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:388
msgid ""
"Disables downloading of packages. This is best used with "
"<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@ -3079,7 +3087,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:384
+#: apt-get.8.xml:395
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3091,17 +3099,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:405
msgid "<option>--simulate</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:407
msgid "<option>--dry-run</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:410
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: "
@@ -3109,7 +3117,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:414
msgid ""
"Simulation run as user will deactivate locking "
"(<literal>Debug::NoLocking</literal>) automatic. Also a notice will be "
@@ -3121,7 +3129,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:420
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -3130,22 +3138,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>-y</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>--yes</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:417
+#: apt-get.8.xml:428
msgid "<option>--assume-yes</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:418
+#: apt-get.8.xml:429
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -3155,68 +3163,96 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:436
+msgid "<option>--assume-no</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:437
+msgid ""
+"Automatic \"no\" to all prompts. Configuration Item: "
+"<literal>APT::Get::Assume-No</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:441
msgid "<option>-u</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:441
msgid "<option>--show-upgraded</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:442
msgid ""
"Show upgraded packages; Print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>-V</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>--verbose-versions</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:448
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:453
+msgid "<option>--host-architecture</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:454
+msgid ""
+"This option controls the architecture packages are built for by "
+"<command>apt-get source --compile</command> and how cross-builddependencies "
+"are satisfied. By default is not set which means that the host architecture "
+"is the same as the build architecture (which is defined by "
+"<literal>APT::Architecture</literal>) Configuration Item: "
+"<literal>APT::Get::Host-Architecture</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:462
msgid "<option>-b</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:462
msgid "<option>--compile</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:463
msgid "<option>--build</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:464
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:468
msgid "<option>--ignore-hold</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:469
msgid ""
"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -3225,12 +3261,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:475
msgid "<option>--no-upgrade</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:450
+#: apt-get.8.xml:476
msgid ""
"Do not upgrade packages; When used in conjunction with "
"<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
@@ -3239,12 +3275,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:482
msgid "<option>--only-upgrade</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:483
msgid ""
"Do not install new packages; When used in conjunction with "
"<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
@@ -3253,12 +3289,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:489
msgid "<option>--force-yes</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:490
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -3268,12 +3304,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:497
msgid "<option>--print-uris</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:498
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -3286,12 +3322,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:508
msgid "<option>--purge</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:509
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be "
@@ -3301,24 +3337,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:516
msgid "<option>--reinstall</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:517
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:495
+#: apt-get.8.xml:521
msgid "<option>--list-cleanup</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:522
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -3329,17 +3365,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:505
+#: apt-get.8.xml:531
msgid "<option>--target-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:532
msgid "<option>--default-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:533
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -3354,12 +3390,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:546
msgid "<option>--trivial-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:522
+#: apt-get.8.xml:548
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where "
@@ -3369,24 +3405,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:554
msgid "<option>--no-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:555
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:534
+#: apt-get.8.xml:560
msgid "<option>--auto-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:561
msgid ""
"If the command is either <literal>install</literal> or "
"<literal>remove</literal>, then this option acts like running "
@@ -3395,12 +3431,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:567
msgid "<option>--only-source</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:568
msgid ""
"Only has meaning for the <literal>source</literal> and "
"<literal>build-dep</literal> commands. Indicates that the given source "
@@ -3412,22 +3448,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--diff-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--dsc-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--tar-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:553
+#: apt-get.8.xml:579
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -3436,24 +3472,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:558
+#: apt-get.8.xml:584
msgid "<option>--arch-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:585
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:589
msgid "<option>--allow-unauthenticated</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:564
+#: apt-get.8.xml:590
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: "
@@ -3461,14 +3497,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:603
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:612
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, "
@@ -3476,29 +3512,29 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:618
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:595
+#: apt-get.8.xml:621
msgid "ORIGINAL AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:596
+#: apt-get.8.xml:622
msgid "&apt-author.jgunthorpe;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:599
+#: apt-get.8.xml:625
msgid "CURRENT AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:601
+#: apt-get.8.xml:627
msgid "&apt-author.team;"
msgstr ""
@@ -3612,24 +3648,43 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:131
msgid ""
-"Update the local keyring with the keyring of Debian archive keys and removes "
-"from the keyring the archive keys which are no longer valid."
+"Update the local keyring with the archive keyring and remove from the local "
+"keyring the archive keys which are no longer valid. The archive keyring is "
+"shipped in the <literal>archive-keyring</literal> package of your "
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:141
+msgid "net-update"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:145
+msgid ""
+"Work similar to the <command>update</command> command above, but get the "
+"archive keyring from an URI instead and validate it against a master key. "
+"This requires an installed &wget; and an APT build configured to have a "
+"server to fetch from and a master keyring to validate. APT in Debian does "
+"not support this command and relies on <command>update</command> instead, "
+"but Ubuntu's APT does."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:162
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:164
msgid "--keyring <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:165
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -3640,42 +3695,42 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:178
msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:180
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:181
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#: apt-key.8.xml:184
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
-msgid "Keyring of Debian archive trusted keys."
+#: apt-key.8.xml:185
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
-msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+#: apt-key.8.xml:188
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
-msgid "Keyring of Debian archive removed trusted keys."
+#: apt-key.8.xml:189
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:198
msgid "&apt-get;, &apt-secure;"
msgstr ""
@@ -3683,8 +3738,8 @@ msgstr ""
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -3703,21 +3758,21 @@ msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> "
"<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
"choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-"choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> "
+"choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
+"choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> "
"</group> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> <arg "
-"choice=\"plain\">showauto</arg> </group>"
+"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> </group>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -3727,104 +3782,128 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+msgid "auto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
-msgid "showauto"
+#: apt-mark.8.xml:85
+msgid "hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:86
msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed. The command is only a wrapper around <command>dpkg "
+"--set-selections</command> and the state is therefore maintained by &dpkg; "
+"and not effected by the <option>--filename</option> option."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:96
-msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
-msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>"
+#: apt-mark.8.xml:101
+msgid "showauto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:102
msgid ""
-"Read/Write package stats from "
-"<filename><replaceable>FILENAME</replaceable></filename> instead of the "
-"default location, which is <filename>extended_status</filename> in the "
-"directory defined by the Configuration Item: <literal>Dir::State</literal>."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line. All automatically "
+"installed packages will be listed if no package is given. If packages are "
+"given only those which are automatically installed will be shown."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
+#: apt-mark.8.xml:109
+msgid "showmanual"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
+#: apt-mark.8.xml:116
+msgid "showhold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
+#: apt-mark.8.xml:117
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
+#: apt-mark.8.xml:130
+msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
+#: apt-mark.8.xml:131
+msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
+#: apt-mark.8.xml:134
+msgid ""
+"Read/Write package stats from "
+"<filename><replaceable>FILENAME</replaceable></filename> instead of the "
+"default location, which is <filename>extended_status</filename> in the "
+"directory defined by the Configuration Item: <literal>Dir::State</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
msgid " &file-extended_states;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -4161,10 +4240,10 @@ msgstr ""
#: apt.conf.5.xml:52
msgid ""
"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
-"order which have no or \"<literal>conf</literal>\" as filename extension and "
-"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
-"characters. Otherwise APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the "
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters. Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
"case it will be silently ignored."
msgstr ""
@@ -4339,13 +4418,24 @@ msgid ""
"compiled for."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:158
+msgid ""
+"All Architectures the system supports. Processors implementing the "
+"<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
+"<literal>i386</literal>; This list is use when fetching files and parsing "
+"package lists. The internal default is always the native architecture "
+"(<literal>APT::Architecture</literal>) and all foreign architectures it can "
+"retrieve by calling <command>dpkg --print-foreign-architectures</command>."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:165
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:166
msgid ""
"Default release to install packages from if more than one version "
"available. Contains release name, codename or release version. Examples: "
@@ -4354,24 +4444,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:171
msgid "Ignore-Hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:164
+#: apt.conf.5.xml:172
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:176
msgid "Clean-Installed"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:177
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -4380,12 +4470,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:175
+#: apt.conf.5.xml:183
msgid "Immediate-Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:176
+#: apt.conf.5.xml:184
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -4418,12 +4508,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:198
+#: apt.conf.5.xml:206
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:207
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a "
@@ -4434,12 +4524,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:215
msgid "Cache-Start, Cache-Grow and Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
+#: apt.conf.5.xml:216
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
@@ -4460,63 +4550,63 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:223
+#: apt.conf.5.xml:231
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:232
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:235
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:236
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:240
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:241
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:245
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:238
+#: apt.conf.5.xml:246
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:244
+#: apt.conf.5.xml:252
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:249
+#: apt.conf.5.xml:257
msgid "Check-Valid-Until"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:250
+#: apt.conf.5.xml:258
msgid ""
"Security related option defaulting to true as an expiring validation for a "
"Release file prevents longtime replay attacks and can e.g. also help users "
@@ -4528,54 +4618,68 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:260
+#: apt.conf.5.xml:268
msgid "Max-ValidTime"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:261
+#: apt.conf.5.xml:269
msgid ""
-"Seconds the Release file should be considered valid after it was "
-"created. The default is \"for ever\" (0) if the Release file of the archive "
-"doesn't include a <literal>Valid-Until</literal> header. If it does then "
-"this date is the default. The date from the Release file or the date "
-"specified by the creation time of the Release file (<literal>Date</literal> "
-"header) plus the seconds specified with this options are used to check if "
-"the validation of a file has expired by using the earlier date of the "
-"two. Archive specific settings can be made by appending the label of the "
-"archive to the option name."
+"Seconds the Release file should be considered valid after it was created "
+"(indicated by the <literal>Date</literal> header). If the Release file "
+"itself includes a <literal>Valid-Until</literal> header the earlier date of "
+"the two is used as the expiration date. The default value is "
+"<literal>0</literal> which stands for \"for ever\". Archive specific "
+"settings can be made by appending the label of the archive to the option "
+"name."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:279
+msgid "Min-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
+msgid ""
+"Minimum of seconds the Release file should be considered valid after it was "
+"created (indicated by the <literal>Date</literal> header). Use this if you "
+"need to use a seldomly updated (local) mirror of a more regular updated "
+"archive with a <literal>Valid-Until</literal> header instead of competely "
+"disabling the expiration date checking. Archive specific settings can and "
+"should be used by appending the label of the archive to the option name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:290
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:274
+#: apt.conf.5.xml:291
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:294
msgid ""
"Two sub-options to limit the use of PDiffs are also available: With "
"<literal>FileLimit</literal> can be specified how many PDiff files are "
"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum precentage of the size of all patches compared to "
+"other hand is the maximum percentage of the size of all patches compared to "
"the size of the targeted file. If one of these limits is exceeded the "
"complete file is downloaded instead of the patches."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:303
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:304
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of "
"<literal>host</literal> or <literal>access</literal> which determines how "
@@ -4585,36 +4689,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:311
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#: apt.conf.5.xml:312
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:299
+#: apt.conf.5.xml:316
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:300
+#: apt.conf.5.xml:317
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304 sources.list.5.xml:144
+#: apt.conf.5.xml:321 sources.list.5.xml:160
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:322
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4626,7 +4730,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#: apt.conf.5.xml:330
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4640,7 +4744,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323 apt.conf.5.xml:387
+#: apt.conf.5.xml:340 apt.conf.5.xml:404
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4648,7 +4752,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:343
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -4660,7 +4764,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:351
msgid ""
"The used bandwidth can be limited with "
"<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -4670,7 +4774,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:339
+#: apt.conf.5.xml:356
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -4678,12 +4782,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:362
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:363
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4693,7 +4797,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:352
+#: apt.conf.5.xml:369
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4715,12 +4819,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:370 sources.list.5.xml:155
+#: apt.conf.5.xml:387 sources.list.5.xml:171
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:388
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4740,7 +4844,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:407
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -4750,7 +4854,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:414
msgid ""
"It is possible to proxy FTP over HTTP by setting the "
"<envar>ftp_proxy</envar> environment variable to a http url - see the "
@@ -4760,7 +4864,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:419
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4770,18 +4874,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:409 sources.list.5.xml:137
+#: apt.conf.5.xml:426 sources.list.5.xml:153
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:415
+#: apt.conf.5.xml:432
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#: apt.conf.5.xml:427
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4794,12 +4898,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:437
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:421
+#: apt.conf.5.xml:438
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4807,12 +4911,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:443
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:449
#, no-wrap
msgid ""
"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -4820,7 +4924,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:427
+#: apt.conf.5.xml:444
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4832,19 +4936,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:454
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:457
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:433
+#: apt.conf.5.xml:450
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -4861,18 +4965,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:461
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:442
+#: apt.conf.5.xml:459
msgid ""
"Note that at run time the "
"<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
"checked: If this setting exists the method will only be used if this file "
-"exists, e.g. for the bzip2 method (the inbuilt) setting is <placeholder "
+"exists, e.g. for the bzip2 method (the inbuilt) setting is: <placeholder "
"type=\"literallayout\" id=\"0\"/> Note also that list entries specified on "
"the command line will be added at the end of the list specified in the "
"configuration files, but before the default entries. To prefer a type in "
@@ -4882,20 +4986,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:466
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
"uncompressed files so this is mostly only useable for local mirrors."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:454
+#: apt.conf.5.xml:471
msgid "GzipIndexes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:473
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4904,12 +5008,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:463
+#: apt.conf.5.xml:480
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:481
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the "
@@ -4922,13 +5026,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:480
+#: apt.conf.5.xml:497
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:487
msgid ""
"The default list includes \"environment\" and "
"\"en\". \"<literal>environment</literal>\" has a special meaning here: It "
@@ -4951,7 +5055,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:253
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" "
@@ -4959,12 +5063,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:487
+#: apt.conf.5.xml:504
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:506
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4976,7 +5080,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:513
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4989,7 +5093,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:522
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4999,7 +5103,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:528
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -5007,7 +5111,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:532
msgid ""
"Binary programs are pointed to by "
"<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -5019,7 +5123,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:540
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -5032,7 +5136,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:553
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -5043,12 +5147,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:562
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:564
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -5056,12 +5160,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:551
+#: apt.conf.5.xml:568
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:569
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5072,50 +5176,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:578
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:582
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:583
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:587
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:588
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:594
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:595
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:583
+#: apt.conf.5.xml:600
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -5123,17 +5227,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:606
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5142,12 +5246,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:612
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:613
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5157,7 +5261,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:619
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5168,36 +5272,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:626
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:627
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is "
"<filename>/</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:631
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:615
+#: apt.conf.5.xml:632
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:637
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:638
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiple calls of dpkg. Without further options dpkg will use triggers only "
@@ -5212,7 +5316,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:653
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5222,7 +5326,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:647
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -5236,12 +5340,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:642
+#: apt.conf.5.xml:659
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:660
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -5253,12 +5357,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:650
+#: apt.conf.5.xml:667
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:668
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5275,12 +5379,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:678
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:662
+#: apt.conf.5.xml:679
msgid ""
"If this option is set apt will call <command>dpkg --configure "
"--pending</command> to let dpkg handle all required configurations and "
@@ -5292,12 +5396,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:685
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:669
+#: apt.conf.5.xml:686
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5307,12 +5411,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:691
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:675
+#: apt.conf.5.xml:692
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 "
@@ -5324,12 +5428,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:699
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:707
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5341,7 +5445,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:700
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 "
@@ -5355,12 +5459,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:720
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:721
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5369,12 +5473,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:729
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:731
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5385,7 +5489,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:742
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -5393,7 +5497,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:750
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s "
@@ -5401,7 +5505,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:759
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5411,110 +5515,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:750
+#: apt.conf.5.xml:767
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:760
+#: apt.conf.5.xml:777
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:782
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:786
msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:793
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:780
+#: apt.conf.5.xml:797
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:787
+#: apt.conf.5.xml:804
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:791
+#: apt.conf.5.xml:808
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:815
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:802
+#: apt.conf.5.xml:819
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:826
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:813
+#: apt.conf.5.xml:830
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:820
+#: apt.conf.5.xml:837
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:841
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:831
+#: apt.conf.5.xml:848
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:851
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:858
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:861
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:851
+#: apt.conf.5.xml:868
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:871
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 "
@@ -5522,92 +5626,92 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:879
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:882
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:873
+#: apt.conf.5.xml:890
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:894
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:884
+#: apt.conf.5.xml:901
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:904
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:894
+#: apt.conf.5.xml:911
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:897
+#: apt.conf.5.xml:914
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:905
+#: apt.conf.5.xml:922
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:926
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:916
+#: apt.conf.5.xml:933
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:937
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:927
+#: apt.conf.5.xml:944
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:948
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:938
+#: apt.conf.5.xml:955
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:958
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial "
@@ -5617,12 +5721,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:969
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:955
+#: apt.conf.5.xml:972
msgid ""
"Generate debug messages describing which package is marked as "
"keep/install/remove while the ProblemResolver does his work. Each addition "
@@ -5640,90 +5744,90 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:991
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:994
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:984
+#: apt.conf.5.xml:1001
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:987
+#: apt.conf.5.xml:1004
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:995
+#: apt.conf.5.xml:1012
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:998
+#: apt.conf.5.xml:1015
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:1005
+#: apt.conf.5.xml:1022
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1009
+#: apt.conf.5.xml:1026
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:1017
+#: apt.conf.5.xml:1034
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1021
+#: apt.conf.5.xml:1038
msgid "Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1028
+#: apt.conf.5.xml:1045
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1032
+#: apt.conf.5.xml:1049
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1055
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1042
+#: apt.conf.5.xml:1059
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:1050
+#: apt.conf.5.xml:1067
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1053
+#: apt.conf.5.xml:1070
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 "
@@ -5731,32 +5835,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1078
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1065
+#: apt.conf.5.xml:1082
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:1088
+#: apt.conf.5.xml:1105
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1112
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1100
+#: apt.conf.5.xml:1117
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
@@ -5827,8 +5931,8 @@ msgstr ""
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
-"following naming convention: The files have no or "
-"\"<literal>pref</literal>\" as filename extension and which only contain "
+"following naming convention: The files have either no or "
+"\"<literal>pref</literal>\" as filename extension and only contain "
"alphanumeric, hyphen (-), underscore (_) and period (.) characters. "
"Otherwise APT will print a notice that it has ignored a file if the file "
"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
@@ -6150,82 +6254,133 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a "
+"glob()-like expression) or contains the word kde (as a POSIX extended "
+"regular expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, no-wrap
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+msgid "Package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:314
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:315
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:319
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:325
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:326
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:288
+#: apt_preferences.5.xml:331
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:332
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:337
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:338
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:342
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:343
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:309
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6233,7 +6388,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:348
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6242,14 +6397,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:354
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:358
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6266,12 +6421,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:371
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:373
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6281,7 +6436,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:378
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6289,7 +6444,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:382
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an "
@@ -6298,12 +6453,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:392
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:394
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6311,27 +6466,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:406
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:364
+#: apt_preferences.5.xml:407
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:411
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:398
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: "
@@ -6343,12 +6498,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:427
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:428
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6359,18 +6514,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:438
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:444
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:445
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6381,13 +6536,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:454
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:461
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -6398,7 +6553,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:470
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6407,12 +6562,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:479
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:480
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6424,18 +6579,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:446
+#: apt_preferences.5.xml:489
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:452
+#: apt_preferences.5.xml:495
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:453
+#: apt_preferences.5.xml:496
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6444,18 +6599,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:459
+#: apt_preferences.5.xml:502
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:465
+#: apt_preferences.5.xml:508
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:509
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6464,13 +6619,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:515
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:416
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6484,7 +6639,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:522
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6499,12 +6654,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:535
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:494
+#: apt_preferences.5.xml:537
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6512,12 +6667,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:503
+#: apt_preferences.5.xml:546
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:554
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6532,7 +6687,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6542,7 +6697,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:528 apt_preferences.5.xml:574 apt_preferences.5.xml:632
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 apt_preferences.5.xml:675
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6551,7 +6706,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:566
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6560,13 +6715,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:583
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:577
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6575,12 +6730,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:589
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:555
+#: apt_preferences.5.xml:598
#, no-wrap
msgid ""
"Package: *\n"
@@ -6597,7 +6752,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:591
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6608,7 +6763,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:612
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6617,13 +6772,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:632
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:623
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6635,12 +6790,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:596
+#: apt_preferences.5.xml:639
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:610
+#: apt_preferences.5.xml:653
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package "
@@ -6662,7 +6817,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:641
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6677,7 +6832,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:670
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6686,13 +6841,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:647
+#: apt_preferences.5.xml:690
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:681
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6704,12 +6859,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:699
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:662
+#: apt_preferences.5.xml:705
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
@@ -6794,7 +6949,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:81
#, no-wrap
-msgid "deb uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri distribution [component1] [component2] [...]"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -6840,6 +6995,38 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:112
msgid ""
+"<literal>options</literal> is always optional and needs to be surounded by "
+"square brackets. It can consist of multiple settings in the form "
+"<literal><replaceable>setting</replaceable>=<replaceable>value</replaceable></literal>. "
+"Multiple settings are separated by spaces. The following settings are "
+"supported by APT, note through that unsupported settings will be ignored "
+"silently:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:117
+msgid ""
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
+"can be used to specify for which architectures packages information should "
+"be downloaded. If this option is not set all architectures defined by the "
+"<literal>APT::Architectures</literal> option will be downloaded."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the "
+"<filename>Release</filename> file is not signed or the signature can't be "
+"checked. This disables parts of &apt-secure; and should therefore only be "
+"used in a local and trusted context. <literal>trusted=no</literal> is the "
+"opposite which handles even correctly authenificated sources as not "
+"authenificated."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:128
+msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@ -6847,12 +7034,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:133
msgid "Some examples:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:119
+#: sources.list.5.xml:135
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6862,17 +7049,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:125
+#: sources.list.5.xml:141
msgid "URI specification"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:146
msgid "file"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:132
+#: sources.list.5.xml:148
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6880,7 +7067,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:155
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media "
"swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
@@ -6888,7 +7075,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:162
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format "
@@ -6899,7 +7086,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:173
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual "
@@ -6911,12 +7098,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:182
msgid "copy"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:184
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6924,17 +7111,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "rsh"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "ssh"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:191
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -6944,12 +7131,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:199
msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:185
+#: sources.list.5.xml:201
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme "
@@ -6963,75 +7150,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:143
msgid ""
"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:215
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:203
+#: sources.list.5.xml:219
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:220
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:222
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:223
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:209
+#: sources.list.5.xml:225
+msgid ""
+"The first line gets package information for the architectures in "
+"<literal>APT::Architectures</literal> while the second always retrieves "
+"<literal>amd64</literal> and <literal>armel</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:227
+#, no-wrap
+msgid ""
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:230
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:211
+#: sources.list.5.xml:232
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:234
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:236
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:238
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7040,19 +7243,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:251
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:244
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under "
@@ -7064,7 +7267,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:256
msgid "&apt-cache; &apt-conf;"
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index dd3cdf8f4..4ab74e4c4 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -1,14 +1,14 @@
# Translation of apt-doc to German
# Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
# This file is distributed under the same license as the apt-doc package.
-# Chris Leick <c.leick@vollbio.de>, 2009, 2010.
+# Chris Leick <c.leick@vollbio.de>, 2009-2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 0.7.25.3\n"
+"Project-Id-Version: apt-doc 0.8.14-1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2011-04-05 10:22+0300\n"
-"PO-Revision-Date: 2010-09-16 19:04+0100\n"
+"POT-Creation-Date: 2011-11-10 16:42+0100\n"
+"PO-Revision-Date: 2011-05-31 21:00+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
"Language: de\n"
@@ -656,16 +656,12 @@ msgstr ""
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:16
-#, fuzzy
-#| msgid ""
-#| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#| "<date>14 February 2004</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
"February 2011</date>"
msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-"<date>14. Februar 2004</date>"
+"<date>04. Februar 2011</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt-cache.8.xml:25 apt-cache.8.xml:32
@@ -690,33 +686,10 @@ msgstr "APT"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-cache.8.xml:33
msgid "query the APT cache"
-msgstr ""
+msgstr "den APT-Zwischenspeicher abfragen"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-cache.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
-#| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
-#| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
-#| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#| "group>"
msgid ""
"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
@@ -741,16 +714,15 @@ msgstr ""
"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
"o=<replaceable>Konfigurationszeichenkette</replaceable></option></arg> "
"<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>Datei</replaceable></arg></arg> <arg>gencaches</arg> "
-"<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
-"arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
-"\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>depends "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-"arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
+"choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep="
+"\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg>showsrc <arg "
+"choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
+"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
+"<arg>search <arg choice=\"plain\"><replaceable>regulärer_Ausdruck</"
+"replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>Paket</replaceable></arg></arg> <arg>depends <arg choice="
+"\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
+"<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
"replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
"\"><replaceable>Präfix</replaceable></arg></arg> <arg>dotty <arg choice="
"\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
@@ -762,8 +734,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
msgid "Description"
@@ -783,7 +755,7 @@ msgstr ""
"und Generieren von interessanten Ausgaben der Paket-Metadaten bereit."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:120
+#: apt-cache.8.xml:70 apt-get.8.xml:127
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -1282,8 +1254,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
+#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
msgid "options"
msgstr "Optionen"
@@ -1310,7 +1282,7 @@ msgstr ""
"pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
#: apt-sortpkgs.1.xml:61
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1338,12 +1310,12 @@ msgstr ""
"srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1422,12 +1394,18 @@ msgstr "<option>--no-replaces</option>"
msgid "<option>--no-enhances</option>"
msgstr "<option>--no-enhances</option>"
-# FIXME s/twicked/tricked/
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:317
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be twicked with these flags "
+#| "which will omit the specified dependency type. Configuration Item: "
+#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be twicked with these flags which will omit "
+"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
"Cache::ShowRecommends</literal>."
@@ -1439,7 +1417,7 @@ msgstr ""
"replaceable></literal> z.B. <literal>APT::Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
+#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
msgid "<option>-f</option>"
msgstr "<option>-f</option>"
@@ -1458,7 +1436,8 @@ msgstr ""
"Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+#: apt-get.8.xml:452
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -1575,14 +1554,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:596
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
+#: apt-cache.8.xml:372 apt-get.8.xml:601 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt.conf.5.xml:1110 apt_preferences.5.xml:697
msgid "Files"
msgstr "Dateien"
@@ -1593,10 +1572,10 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
-#: sources.list.5.xml:234
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:611
+#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
msgid "See Also"
msgstr "Siehe auch"
@@ -1607,8 +1586,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:617
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "Diagnose"
@@ -1737,12 +1716,12 @@ msgstr ""
"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:161
msgid "Options"
msgstr "Optionen"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -1786,7 +1765,7 @@ msgstr ""
"Konfigurationselement: <literal>APT::CDROM::Rename</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:364
+#: apt-cdrom.8.xml:116 apt-get.8.xml:375
msgid "<option>-m</option>"
msgstr "<option>-m</option>"
@@ -1841,17 +1820,17 @@ msgstr ""
"Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:395
+#: apt-cdrom.8.xml:143 apt-get.8.xml:406
msgid "<option>--just-print</option>"
msgstr "<option>--just-print</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:397
+#: apt-cdrom.8.xml:144 apt-get.8.xml:408
msgid "<option>--recon</option>"
msgstr "<option>--recon</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:398
+#: apt-cdrom.8.xml:145 apt-get.8.xml:409
msgid "<option>--no-act</option>"
msgstr "<option>--no-act</option>"
@@ -1996,7 +1975,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
#: apt-sortpkgs.1.xml:73
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2076,7 +2055,7 @@ msgstr ""
"XXXX</filename> angegeben wurde"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
+#: apt-extracttemplates.1.xml:63 apt-get.8.xml:530
msgid "<option>-t</option>"
msgstr "<option>-t</option>"
@@ -2309,6 +2288,18 @@ msgid ""
"literal>. It then writes to stdout a Release file containing a MD5, SHA1 "
"and SHA256 digest for each file."
msgstr ""
+"Der Befehl <literal>release</literal> erzeugt eine Release-Datei aus einem "
+"Verzeichnisbaum. Standardmäßig durchsucht er rekursiv das angegebene "
+"Verzeichnis nach nicht komprimierten <filename>Packages</filename>- und "
+"<filename>Sources</filename>-Dateien und denen, die mit <command>gzip</"
+"command>, <command>bzip2</command> oder <command>lzma</command> komprimiert "
+"wurden, ebenso wie <filename>Release</filename>- und <filename>md5sum.txt</"
+"filename>-Dateien (<literal>APT::FTPArchive::Release::Default-Patterns</"
+"literal>). Zusätzliche Muster für Dateinamen können hinzugefügt werden, "
+"indem sie in <literal>APT::FTPArchive::Release::Patterns</literal> "
+"aufgeführt werden. Dann schreibt er eine Release-Datei auf die "
+"Standardausgabe, die für jede Datei eine MD5-, SHA1- und SHA256-Prüfsumme "
+"enthält."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:125
@@ -2353,7 +2344,7 @@ msgstr ""
"Verwaltung der erforderlichen Einstellungen bereitstellt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:287
+#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
msgid "clean"
msgstr "clean"
@@ -2922,8 +2913,8 @@ msgstr ""
"der Distribution erscheint, typischerweise etwas wie <literal>main contrib "
"non-free</literal>"
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
msgid "Architectures"
msgstr "Architekturen"
@@ -3147,46 +3138,52 @@ msgstr ""
msgid ""
"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
msgstr ""
+"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:531
#, fuzzy
#| msgid ""
-#| "Values for the additional metadata fields in the Release file are taken "
-#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
-#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The "
-#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
-#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
-#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
-#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
-#| "literal>, <literal>Description</literal>."
+#| "Generate the given checksum. These options default to on, when turned off "
+#| "the generated index files will not have the checksum fields where "
+#| "possible. Configuration Items: <literal>APT::FTPArchive::"
+#| "<replaceable>Checksum</replaceable></literal> and <literal>APT::"
+#| "FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</"
+#| "replaceable></literal> where <literal><replaceable>Index</replaceable></"
+#| "literal> can be <literal>Packages</literal>, <literal>Sources</literal> "
+#| "or <literal>Release</literal> and <literal><replaceable>Checksum</"
+#| "replaceable></literal> can be <literal>MD5</literal>, <literal>SHA1</"
+#| "literal> or <literal>SHA256</literal>."
msgid ""
"Generate the given checksum. These options default to on, when turned off "
"the generated index files will not have the checksum fields where possible. "
"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
"replaceable>::<replaceable>Checksum</replaceable></literal> where "
-"<literal>Index</literal> can be <literal>Packages</literal>, "
-"<literal>Sources</literal> or <literal>Release</literal> and "
-"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
-"literal> or <literal>SHA256</literal>."
-msgstr ""
-"Werte für zusätzliche Metadatenfelder in der Release-Datei werden den "
-"entsprechenden Variablen unter <literal>APT::FTPArchive::Release</literal> "
-"entnommen, z.B. <literal>APT::FTPArchive::Release::Origin</literal>. Die "
-"unterstützten Felder sind: <literal>Origin</literal>, <literal>Label</"
-"literal>, <literal>Suite</literal>, <literal>Version</literal>, "
-"<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-Until</"
-"literal>, <literal>Architectures</literal>, <literal>Components</literal>, "
-"<literal>Description</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:539
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+msgstr ""
+"erzeugt die vorgegebene Prüfsumme. Diese Optionen sind standardmäßig "
+"aktiviert. Wenn sie deaktiviert sind, werden die erzeugten Indexdateien nach "
+"Möglichkeit keine Prüfsummenfelder erhalten. Konfigurationselemente: "
+"<literal>APT::FTPArchive::<replaceable>Prüfsumme</replaceable></literal> und "
+"<literal>APT::FTPArchive::<replaceable>Index</replaceable>::"
+"<replaceable>Prüfsumme</replaceable></literal>, wobei "
+"<literal><replaceable>Index</replaceable></literal> <literal>Packages</"
+"literal>, <literal>Sources</literal> oder <literal>Release</literal> sein "
+"kann und <literal><replaceable>Prüfsumme</replaceable></literal> "
+"<literal>MD5</literal>, <literal>SHA1</literal> oder <literal>SHA256</"
+"literal> sein kann."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:540
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3196,7 +3193,7 @@ msgstr ""
"DB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:547
+#: apt-ftparchive.1.xml:548
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3210,12 +3207,12 @@ msgstr ""
"Konfigurationselement: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:556
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3229,12 +3226,12 @@ msgstr ""
"DeLinkAct</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3250,12 +3247,12 @@ msgstr ""
"Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:571
+#: apt-ftparchive.1.xml:572
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3266,12 +3263,12 @@ msgstr ""
"SourceOverride</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:578
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:580
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3280,12 +3277,12 @@ msgstr ""
"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:584
msgid "<option>--arch</option>"
msgstr "<option>--arch</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:585
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3299,12 +3296,12 @@ msgstr ""
"Architecture</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:590
+#: apt-ftparchive.1.xml:591
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3328,12 +3325,12 @@ msgstr ""
"haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:602
+#: apt-ftparchive.1.xml:603
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:605
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3349,19 +3346,19 @@ msgstr ""
"werden kann."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
-#: sources.list.5.xml:198
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
msgid "Examples"
msgstr "Beispiele"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:618
+#: apt-ftparchive.1.xml:619
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3371,7 +3368,7 @@ msgstr ""
">"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:632
+#: apt-ftparchive.1.xml:633
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3401,15 +3398,45 @@ msgstr "APT-Werkzeug für den Umgang mit Paketen -- Befehlszeilenschnittstelle"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-get.8.xml:39
+#, fuzzy
+#| msgid ""
+#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
+#| "<arg> <option>-t=</option> <arg choice='plain'> "
+#| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+#| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+#| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
+#| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#| "<group choice='req'> <arg choice='plain'> "
+#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#| "help</arg> </group> </arg> </group>"
msgid ""
"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <group choice=\"req\"> <arg "
-"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
-"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
-"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
+"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
+"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
+"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
+"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
+"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
@@ -3458,7 +3485,7 @@ msgstr ""
"group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:115
+#: apt-get.8.xml:122
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
@@ -3471,12 +3498,12 @@ msgstr ""
"Oberflächenschnittstellen, wie &dselect;, &aptitude;, &synaptic; und &wajig;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:124 apt-key.8.xml:127
+#: apt-get.8.xml:131 apt-key.8.xml:127
msgid "update"
msgstr "update"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:132
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources. The indexes of available packages are fetched from the "
@@ -3500,12 +3527,12 @@ msgstr ""
"Größe der Pakete nicht im voraus bekannt ist."
#. type: <tag></tag>
-#: apt-get.8.xml:136 guide.sgml:121
+#: apt-get.8.xml:143 guide.sgml:121
msgid "upgrade"
msgstr "upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:137
+#: apt-get.8.xml:144
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -3531,12 +3558,12 @@ msgstr ""
"get</command> die neuen Versionen der verfügbaren Pakete kennt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:149
+#: apt-get.8.xml:156
msgid "dselect-upgrade"
msgstr "dselect-upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:150
+#: apt-get.8.xml:157
msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3553,12 +3580,12 @@ msgstr ""
"Installieren von neuen Paketen)."
#. type: <tag></tag>
-#: apt-get.8.xml:159 guide.sgml:140
+#: apt-get.8.xml:166 guide.sgml:140
msgid "dist-upgrade"
msgstr "dist-upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:167
msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3582,12 +3609,12 @@ msgstr ""
"überschreiben der allgemeinen Einstellungen für einzelne Pakete."
#. type: <tag></tag>
-#: apt-get.8.xml:172 guide.sgml:131
+#: apt-get.8.xml:179 guide.sgml:131
msgid "install"
msgstr "install"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:181
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
@@ -3616,7 +3643,7 @@ msgstr ""
"vom Konfliktauflösungssystem von apt-get getroffen wurden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:199
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -3634,7 +3661,7 @@ msgstr ""
"ausgewählt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:206
msgid ""
"Both of the version selection mechanisms can downgrade packages and must be "
"used with care."
@@ -3643,7 +3670,7 @@ msgstr ""
"durchführen und müssen mit Vorsicht gehandhabt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:202
+#: apt-get.8.xml:209
msgid ""
"This is also the target to use if you want to upgrade one or more already-"
"installed packages without upgrading every package you have on your system. "
@@ -3664,7 +3691,7 @@ msgstr ""
"heruntergeladen und installiert."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:220
msgid ""
"Finally, the &apt-preferences; mechanism allows you to create an alternative "
"installation policy for individual packages."
@@ -3673,7 +3700,7 @@ msgstr ""
"alternative Installationsrichtlinie für eigene Pakete zu erzeugen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:224
msgid ""
"If no package matches the given expression and the expression contains one "
"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3693,12 +3720,12 @@ msgstr ""
"Zeichen, um genauere reguläre Ausdruck zu erstellen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:233
msgid "remove"
msgstr "remove"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:227
+#: apt-get.8.xml:234
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note the removing a package "
@@ -3713,12 +3740,12 @@ msgstr ""
"Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:241
msgid "purge"
msgstr "purge"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:235
+#: apt-get.8.xml:242
msgid ""
"<literal>purge</literal> is identical to <literal>remove</literal> except "
"that packages are removed and purged (any configuration files are deleted "
@@ -3729,12 +3756,12 @@ msgstr ""
"Konfigurationsdateien werden mitgelöscht)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:246
msgid "source"
msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:240
+#: apt-get.8.xml:247
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -3754,7 +3781,7 @@ msgstr ""
"wurde, wenn möglich."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:248
+#: apt-get.8.xml:255
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
"src</literal> type lines in the &sources-list; file. This means that you "
@@ -3770,12 +3797,19 @@ msgstr ""
"installiert haben oder installieren könnten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:262
+#, fuzzy
+#| msgid ""
+#| "If the <option>--compile</option> option is specified then the package "
+#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+#| "command>, if <option>--download-only</option> is specified then the "
+#| "source package will not be unpacked."
msgid ""
"If the <option>--compile</option> option is specified then the package will "
-"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
-"<option>--download-only</option> is specified then the source package will "
-"not be unpacked."
+"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+"the architecture as defined by the <command>--host-architecture</command> "
+"option. If <option>--download-only</option> is specified then the source "
+"package will not be unpacked."
msgstr ""
"Wenn die <option>--compile</option>-Option angegeben ist, dann wird das "
"Paket unter Benutzung von <command>dpkg-buildpackage</command> zu einem "
@@ -3783,7 +3817,7 @@ msgstr ""
"ist, wird das Quellpaket nicht entpackt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:260
+#: apt-get.8.xml:269
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -3799,7 +3833,7 @@ msgstr ""
"literal>-Option."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:275
msgid ""
"Note that source packages are not tracked like binary packages, they exist "
"only in the current directory and are similar to downloading source tar "
@@ -3810,27 +3844,34 @@ msgstr ""
"heruntergeladenen Tarballs ähnlich."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:280
msgid "build-dep"
msgstr "build-dep"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:281
+#, fuzzy
+#| msgid ""
+#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+#| "an attempt to satisfy the build dependencies for a source package."
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
-"attempt to satisfy the build dependencies for a source package."
+"attempt to satisfy the build dependencies for a source package. By default "
+"the dependencies are satisfied to build the package nativly. If desired a "
+"host-architecture can be specified with the <option>--host-architecture</"
+"option> option instead."
msgstr ""
"<literal>build-dep</literal> veranlasst apt-get, Pakete zu installieren/"
"entfernen, um zu versuchen, die Bauabhängigkeiten eines Quellpakets zu "
"erfüllen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:276
+#: apt-get.8.xml:287
msgid "check"
msgstr "check"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:288
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
@@ -3839,19 +3880,25 @@ msgstr ""
"Paketzwischenspeicher und prüft, ob beschädigte Abhängigkeiten vorliegen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:292
msgid "download"
-msgstr ""
+msgstr "download"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:293
+#, fuzzy
+#| msgid ""
+#| "<literal>download</literal> will download the given binary package into "
+#| "the current directory."
msgid ""
"<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
msgstr ""
+"<literal>download</literal> wird das angegebene Binärpaket in das aktuelle "
+"Verzeichnis herunterladen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:299
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -3870,12 +3917,12 @@ msgstr ""
"Zeit zu Zeit ausführen, um Plattenplatz freizugeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid "autoclean"
msgstr "autoclean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:298
+#: apt-get.8.xml:309
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -3895,28 +3942,33 @@ msgstr ""
"sie auf »off« gesetzt ist."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:307
+#: apt-get.8.xml:318
msgid "autoremove"
msgstr "autoremove"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:319
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for some package and that "
+#| "are no more needed."
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for some package and that "
-"are no more needed."
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
msgstr ""
"<literal>autoremove</literal> wird benutzt, um Pakete, die automatisch "
"installiert wurden, um Abhängigkeiten für einige Pakete zu erfüllen und die "
"nicht mehr benötigt werden, zu entfernen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:323
msgid "changelog"
-msgstr ""
+msgstr "changelog"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:324
msgid ""
"<literal>changelog</literal> downloads a package changelog and displays it "
"through <command>sensible-pager</command>. The server name and base "
@@ -3927,14 +3979,22 @@ msgid ""
"installed. However, you can specify the same options as for the "
"<option>install</option> command."
msgstr ""
+"<literal>changelog</literal> lädt ein Changelog eines Pakets herunter und "
+"zeigt es mit <command>sensible-pager</command> an. Der Servername und das "
+"Basisverzeichnis sind in der Variable <literal>APT::Changelogs::Server</"
+"literal> definiert (z.B. <ulink>http://packages.debian.org/changelogs</"
+"ulink> für Debian oder <ulink>http://changelogs.ubuntu.com/changelogs</"
+"ulink> für Ubuntu). Standardmäßig zeigt es das Changelog für die "
+"installierte Version. Sie können jedoch die gleichen Optionen wie für den "
+"Befehl <option>install</option> angeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:335
+#: apt-get.8.xml:346
msgid "<option>--no-install-recommends</option>"
msgstr "<option>--no-install-recommends</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:336
+#: apt-get.8.xml:347
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3943,32 +4003,26 @@ msgstr ""
"Konfigurationselement: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:340
-#, fuzzy
-#| msgid "<option>--no-suggests</option>"
+#: apt-get.8.xml:351
msgid "<option>--install-suggests</option>"
-msgstr "<option>--no-suggests</option>"
+msgstr "<option>--install-suggests</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:341
-#, fuzzy
-#| msgid ""
-#| "Do not consider recommended packages as a dependency for installing. "
-#| "Configuration Item: <literal>APT::Install-Recommends</literal>."
+#: apt-get.8.xml:352
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
msgstr ""
-"Empfohlene Pakete nicht als Abhängigkeit für die Installation betrachten. "
-"Konfigurationselement: <literal>APT::Install-Recommends</literal>."
+"Empfohlene Pakete als Abhängigkeit für die Installation betrachten. "
+"Konfigurationselement: <literal>APT::Install-Suggests</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:356
msgid "<option>--download-only</option>"
msgstr "<option>--download-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:357
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -3978,12 +4032,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:350
+#: apt-get.8.xml:361
msgid "<option>--fix-broken</option>"
msgstr "<option>--fix-broken</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:362
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -4012,17 +4066,17 @@ msgstr ""
"Konfigurationselement: <literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:375
msgid "<option>--ignore-missing</option>"
msgstr "<option>--ignore-missing</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:365
+#: apt-get.8.xml:376
msgid "<option>--fix-missing</option>"
msgstr "<option>--fix-missing</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:366
+#: apt-get.8.xml:377
msgid ""
"Ignore missing packages; If packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -4043,12 +4097,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:387
msgid "<option>--no-download</option>"
msgstr "<option>--no-download</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:388
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -4060,7 +4114,7 @@ msgstr ""
"<literal>APT::Get::Download</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:384
+#: apt-get.8.xml:395
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4080,17 +4134,17 @@ msgstr ""
"Konfigurationselement: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:405
msgid "<option>--simulate</option>"
msgstr "<option>--simulate</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:407
msgid "<option>--dry-run</option>"
msgstr "<option>--dry-run</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:410
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -4101,7 +4155,7 @@ msgstr ""
"<literal>APT::Get::Simulate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:414
msgid ""
"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
"literal>) automatic. Also a notice will be displayed indicating that this "
@@ -4119,7 +4173,7 @@ msgstr ""
"Warnungen von <literal>apt-get</literal> wissen, was er tut)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:420
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4132,22 +4186,22 @@ msgstr ""
"eckiger Klammern bedeutet Unterbrechungen, die keine Folgen haben (selten)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>-y</option>"
msgstr "<option>-y</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>--yes</option>"
msgstr "<option>--yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:417
+#: apt-get.8.xml:428
msgid "<option>--assume-yes</option>"
msgstr "<option>--assume-yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:418
+#: apt-get.8.xml:429
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -4163,17 +4217,37 @@ msgstr ""
"Get::Assume-Yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:436
+#, fuzzy
+#| msgid "<option>--assume-yes</option>"
+msgid "<option>--assume-no</option>"
+msgstr "<option>--assume-yes</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:437
+#, fuzzy
+#| msgid ""
+#| "Compile source packages after downloading them. Configuration Item: "
+#| "<literal>APT::Get::Compile</literal>."
+msgid ""
+"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+"Kompiliert Quellpakete, nachdem sie heruntergeladen wurden. "
+"Konfigurationselement: <literal>APT::Get::Compile</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:441
msgid "<option>-u</option>"
msgstr "<option>-u</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:441
msgid "<option>--show-upgraded</option>"
msgstr "<option>--show-upgraded</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:442
msgid ""
"Show upgraded packages; Print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4183,17 +4257,17 @@ msgstr ""
"Konfigurationselement: <literal>APT::Get::Show-Upgraded</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>-V</option>"
msgstr "<option>-V</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>--verbose-versions</option>"
msgstr "<option>--verbose-versions</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:448
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -4203,22 +4277,40 @@ msgstr ""
"Versions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:453
+#, fuzzy
+#| msgid "<option>--recurse</option>"
+msgid "<option>--host-architecture</option>"
+msgstr "<option>--recurse</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:454
+msgid ""
+"This option controls the architecture packages are built for by <command>apt-"
+"get source --compile</command> and how cross-builddependencies are "
+"satisfied. By default is not set which means that the host architecture is "
+"the same as the build architecture (which is defined by <literal>APT::"
+"Architecture</literal>) Configuration Item: <literal>APT::Get::Host-"
+"Architecture</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:462
msgid "<option>-b</option>"
msgstr "<option>-b</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:462
msgid "<option>--compile</option>"
msgstr "<option>--compile</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:463
msgid "<option>--build</option>"
msgstr "<option>--build</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:464
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -4227,12 +4319,12 @@ msgstr ""
"Konfigurationselement: <literal>APT::Get::Compile</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:468
msgid "<option>--ignore-hold</option>"
msgstr "<option>--ignore-hold</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:469
msgid ""
"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -4246,12 +4338,12 @@ msgstr ""
"<literal>APT::Ignore-Hold</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:475
msgid "<option>--no-upgrade</option>"
msgstr "<option>--no-upgrade</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:450
+#: apt-get.8.xml:476
msgid ""
"Do not upgrade packages; When used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4265,12 +4357,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:482
msgid "<option>--only-upgrade</option>"
msgstr "<option>--only-upgrade</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:483
msgid ""
"Do not install new packages; When used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -4284,12 +4376,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:489
msgid "<option>--force-yes</option>"
msgstr "<option>--force-yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:490
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -4304,12 +4396,12 @@ msgstr ""
"zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:497
msgid "<option>--print-uris</option>"
msgstr "<option>--print-uris</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:498
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -4331,12 +4423,12 @@ msgstr ""
"Get::Print-URIs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:508
msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:509
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4349,12 +4441,12 @@ msgstr ""
"option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:516
msgid "<option>--reinstall</option>"
msgstr "<option>--reinstall</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:517
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4363,12 +4455,12 @@ msgstr ""
"Version sind. Konfigurationselement: <literal>APT::Get::ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:495
+#: apt-get.8.xml:521
msgid "<option>--list-cleanup</option>"
msgstr "<option>--list-cleanup</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:522
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -4386,17 +4478,17 @@ msgstr ""
"Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:505
+#: apt-get.8.xml:531
msgid "<option>--target-release</option>"
msgstr "<option>--target-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:532
msgid "<option>--default-release</option>"
msgstr "<option>--default-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:533
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -4421,12 +4513,12 @@ msgstr ""
"auch die &apt-preferences;-Handbuchseite."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:546
msgid "<option>--trivial-only</option>"
msgstr "<option>--trivial-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:522
+#: apt-get.8.xml:548
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4440,12 +4532,12 @@ msgstr ""
"Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:554
msgid "<option>--no-remove</option>"
msgstr "<option>--no-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:555
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4454,12 +4546,12 @@ msgstr ""
"Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:534
+#: apt-get.8.xml:560
msgid "<option>--auto-remove</option>"
msgstr "<option>--auto-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:561
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4473,12 +4565,12 @@ msgstr ""
"AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:567
msgid "<option>--only-source</option>"
msgstr "<option>--only-source</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:568
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -4497,22 +4589,22 @@ msgstr ""
"Get::Only-Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--diff-only</option>"
msgstr "<option>--diff-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--dsc-only</option>"
msgstr "<option>--dsc-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--tar-only</option>"
msgstr "<option>--tar-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:553
+#: apt-get.8.xml:579
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4524,12 +4616,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:558
+#: apt-get.8.xml:584
msgid "<option>--arch-only</option>"
msgstr "<option>--arch-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:585
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -4538,12 +4630,12 @@ msgstr ""
"Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:589
msgid "<option>--allow-unauthenticated</option>"
msgstr "<option>--allow-unauthenticated</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:564
+#: apt-get.8.xml:590
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -4554,7 +4646,7 @@ msgstr ""
"<literal>APT::Get::AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:603
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
@@ -4563,7 +4655,7 @@ msgstr ""
"&file-statelists;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:612
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4574,7 +4666,7 @@ msgstr ""
"preferences;, das APT-Howto."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:618
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -4583,22 +4675,22 @@ msgstr ""
"100 bei Fehlern."
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:595
+#: apt-get.8.xml:621
msgid "ORIGINAL AUTHORS"
msgstr "ORIGINALAUTOREN"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:596
+#: apt-get.8.xml:622
msgid "&apt-author.jgunthorpe;"
msgstr "&apt-author.jgunthorpe;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:599
+#: apt-get.8.xml:625
msgid "CURRENT AUTHORS"
msgstr "AKTUELLE AUTOREN"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:601
+#: apt-get.8.xml:627
msgid "&apt-author.team;"
msgstr "&apt-author.team;"
@@ -4729,15 +4821,33 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:131
msgid ""
-"Update the local keyring with the keyring of Debian archive keys and removes "
-"from the keyring the archive keys which are no longer valid."
+"Update the local keyring with the archive keyring and remove from the local "
+"keyring the archive keys which are no longer valid. The archive keyring is "
+"shipped in the <literal>archive-keyring</literal> package of your "
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:141
+#, fuzzy
+#| msgid "update"
+msgid "net-update"
+msgstr "update"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:145
+msgid ""
+"Work similar to the <command>update</command> command above, but get the "
+"archive keyring from an URI instead and validate it against a master key. "
+"This requires an installed &wget; and an APT build configured to have a "
+"server to fetch from and a master keyring to validate. APT in Debian does "
+"not support this command and relies on <command>update</command> instead, "
+"but Ubuntu's APT does."
msgstr ""
-"Den lokalen Schlüsselbund mit dem Schlüsselbund der Debian-Archivschlüssel "
-"aktualisieren und aus dem Schlüsselbund die Archivschlüssel entfernen, die "
-"nicht länger gültig sind."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:162
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
@@ -4746,12 +4856,12 @@ msgstr ""
"Befehlen definiert sein müssen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:164
msgid "--keyring <replaceable>filename</replaceable>"
msgstr "--keyring <replaceable>Dateiname</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:165
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -4768,54 +4878,67 @@ msgstr ""
"Schlüssel werden zu diesem hinzugefügt."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:178
msgid "&file-trustedgpg;"
msgstr "&file-trustedgpg;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:180
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:181
msgid "Local trust database of archive keys."
msgstr "Lokale Datenbank vertrauenswürdiger Archivschlüssel."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#: apt-key.8.xml:184
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
-msgid "Keyring of Debian archive trusted keys."
+#: apt-key.8.xml:185
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:188
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
-msgid "Keyring of Debian archive removed trusted keys."
+#: apt-key.8.xml:189
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
"Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:198
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
+#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+#| "August 2009</date>"
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
msgstr ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9. "
"August 2009</date>"
@@ -4834,13 +4957,22 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:39
+#, fuzzy
+#| msgid ""
+#| " <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
+#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
msgstr ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>DATEINAME</replaceable></option></arg> <group choice=\"plain"
@@ -4850,7 +4982,7 @@ msgstr ""
"arg> <arg choice=\"plain\">showauto</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
@@ -4859,7 +4991,7 @@ msgstr ""
"installiert markiert ist."
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4875,14 +5007,21 @@ msgstr ""
"<command>aptitude</command> entfernt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+#, fuzzy
+#| msgid "markauto"
+msgid "auto"
msgstr "markauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
+#, fuzzy
+#| msgid ""
+#| "<literal>markauto</literal> is used to mark a package as being "
+#| "automatically installed, which will cause the package to be removed when "
+#| "no more manually installed packages depend on this package."
msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
@@ -4891,14 +5030,19 @@ msgstr ""
"keine manuell installierten Pakete von ihm abhängen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
-msgstr "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
+msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
+#, fuzzy
+#| msgid ""
+#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
@@ -4907,28 +5051,102 @@ msgstr ""
"entfernt wird, wenn kein anderes Paket von ihm abhängt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
+#: apt-mark.8.xml:85
+msgid "hold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:86
+msgid ""
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed. The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:96
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>showauto</literal> wird benutzt, um eine Liste automatisch "
+"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:101
msgid "showauto"
msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"installed packages with each package on a new line. All automatically "
+"installed packages will be listed if no package is given. If packages are "
+"given only those which are automatically installed will be shown."
msgstr ""
"<literal>showauto</literal> wird benutzt, um eine Liste automatisch "
"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:109
+#, fuzzy
+#| msgid "showauto"
+msgid "showmanual"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:116
+#, fuzzy
+#| msgid "showauto"
+msgid "showhold"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:117
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showauto</literal> wird benutzt, um eine Liste automatisch "
+"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:130
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
"<option>-f=<filename><replaceable>DATEINAME</replaceable></filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:131
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -4937,7 +5155,7 @@ msgstr ""
"option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:134
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -4949,48 +5167,18 @@ msgstr ""
"filename> im von Konfigurationselement <literal>Dir::State</literal> "
"definierten Verzeichnis, ist."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
-msgstr "<option>-h</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
-msgstr "<option>--help</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
-msgstr "Eine kurze Zusammenfassung anzeigen."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
-msgstr "<option>-v</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
-msgstr "<option>--version</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
-msgstr "Die Programmversion anzeigen."
-
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
msgid " &file-extended_states;"
msgstr " &file-extended_states;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-get;,&aptitude;,&apt-conf;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -5205,14 +5393,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:147
-#, fuzzy
-#| msgid ""
-#| "In order to add a new key you need to first download it (you should make "
-#| "sure you are using a trusted communication channel when retrieving it), "
-#| "add it with <command>apt-key</command> and then run <command>apt-get "
-#| "update</command> so that apt can download and verify the "
-#| "<filename>Release.gpg</filename> files from the archives you have "
-#| "configured."
msgid ""
"In order to add a new key you need to first download it (you should make "
"sure you are using a trusted communication channel when retrieving it), add "
@@ -5225,8 +5405,9 @@ msgstr ""
"(Sie sollten sicherstellen, dass Sie einen vertrauenswürdigen "
"Kommunikationskanal benutzen, wenn Sie ihn herunterladen), ihn mit "
"<command>apt-key</command> hinzufügen und dann <command>apt-get update</"
-"command> ausführen, so dass APT die <filename>Release.gpg</filename>-Dateien "
-"der von Ihnen konfigurierten Archive herunterladen und prüfen kann."
+"command> ausführen, so dass APT die Dateien <filename>InRelease</filename> "
+"oder <filename>Release.gpg</filename> der von Ihnen konfigurierten Archive "
+"herunterladen und prüfen kann."
#. type: Content of: <refentry><refsect1><title>
#: apt-secure.8.xml:156
@@ -5255,17 +5436,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
-#, fuzzy
-#| msgid ""
-#| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
-#| "abs -o Release.gpg Release</command>."
msgid ""
"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
"gpg Release</command>."
msgstr ""
"<emphasis>Es signieren</emphasis>. Sie können dies tun, indem Sie "
-"<command>gpg -abs -o Release.gpg Release</command> ausführen."
+"<command>gpg --clearsign -o InRelease Release</command> und <command>gpg -"
+"abs -o Release.gpg Release</command> ausführen."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:172
@@ -5463,20 +5641,27 @@ msgstr ""
#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
#| "order which have no or \"<literal>conf</literal>\" as filename extension "
#| "and which only contain alphanumeric, hyphen (-), underscore (_) and "
-#| "period (.) characters - otherwise they will be silently ignored."
+#| "period (.) characters. Otherwise APT will print a notice that it has "
+#| "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+#| "Ignore-Files-Silently</literal> configuration list - in this case it will "
+#| "be silently ignored."
msgid ""
"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
-"order which have no or \"<literal>conf</literal>\" as filename extension and "
-"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
-"characters. Otherwise APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters. Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
msgstr ""
"alle Dateien in <literal>Dir::Etc::Parts</literal> in aufsteigender "
"alphanumerischer Reihenfolge, die kein »<literal>conf</literal>« als "
-"Dateinamenserweiterung haben und die alphanumerische Zeichen, Bindestriche "
-"(-), Unterstriche (_) und Punkte (.) enthalten – andernfalls werden sie "
-"stillschweigend ignoriert."
+"Dateinamenserweiterung haben und die nur alphanumerische Zeichen, "
+"Bindestriche (-), Unterstriche (_) und Punkte (.) enthalten. Andernfalls "
+"wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die "
+"Datei nicht auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-"
+"Files-Silently</literal> passt – in diesem Fall wird sie stillschweigend "
+"ignoriert."
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:59
@@ -5733,13 +5918,24 @@ msgstr ""
"heruntergeladen und Paketlisten ausgewertet werden. Die interne Vorgabe ist "
"die Architektur für die APT kompiliert wurde."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:158
+msgid ""
+"All Architectures the system supports. Processors implementing the "
+"<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
+"<literal>i386</literal>; This list is use when fetching files and parsing "
+"package lists. The internal default is always the native architecture "
+"(<literal>APT::Architecture</literal>) and all foreign architectures it can "
+"retrieve by calling <command>dpkg --print-foreign-architectures</command>."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:165
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:166
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5752,12 +5948,12 @@ msgstr ""
"codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:171
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:164
+#: apt.conf.5.xml:172
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -5766,12 +5962,12 @@ msgstr ""
"Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:176
msgid "Clean-Installed"
msgstr "Clean-Installed"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:177
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -5786,12 +5982,12 @@ msgstr ""
"Möglichkeiten bereitstellt, um sie erneut zu installieren."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:175
+#: apt.conf.5.xml:183
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:176
+#: apt.conf.5.xml:184
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -5859,12 +6055,12 @@ msgstr ""
"Upgrade-Prozesses arbeiten kann."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:198
+#: apt.conf.5.xml:206
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:207
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -5882,12 +6078,12 @@ msgstr ""
"bash oder etwas, was davon abhängt, sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:215
msgid "Cache-Start, Cache-Grow and Cache-Limit"
msgstr "Cache-Start, Cache-Grow und Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
+#: apt.conf.5.xml:216
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
@@ -5924,24 +6120,24 @@ msgstr ""
"auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:223
+#: apt.conf.5.xml:231
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:232
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
"Definiert, welche(s) Paket(e) als essentielle Bauabhängigkeiten betrachtet "
"werde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:235
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:236
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -5951,12 +6147,12 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:240
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:241
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -5966,12 +6162,12 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:245
msgid "CDROM"
msgstr "CD-ROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:238
+#: apt.conf.5.xml:246
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -5981,17 +6177,17 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:244
+#: apt.conf.5.xml:252
msgid "The Acquire Group"
msgstr "Die Erwerbgruppe"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:249
+#: apt.conf.5.xml:257
msgid "Check-Valid-Until"
msgstr "Check-Valid-Until"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:250
+#: apt.conf.5.xml:258
msgid ""
"Security related option defaulting to true as an expiring validation for a "
"Release file prevents longtime replay attacks and can e.g. also help users "
@@ -6011,22 +6207,69 @@ msgstr ""
"gewollt ist, kann die Option <literal>Max-ValidTime</literal> benutzt werden."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:260
+#: apt.conf.5.xml:268
msgid "Max-ValidTime"
msgstr "Max-ValidTime"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:261
-msgid ""
-"Seconds the Release file should be considered valid after it was created. "
-"The default is \"for ever\" (0) if the Release file of the archive doesn't "
-"include a <literal>Valid-Until</literal> header. If it does then this date "
-"is the default. The date from the Release file or the date specified by the "
-"creation time of the Release file (<literal>Date</literal> header) plus the "
-"seconds specified with this options are used to check if the validation of a "
-"file has expired by using the earlier date of the two. Archive specific "
-"settings can be made by appending the label of the archive to the option "
-"name."
+#: apt.conf.5.xml:269
+#, fuzzy
+#| msgid ""
+#| "Seconds the Release file should be considered valid after it was created. "
+#| "The default is \"for ever\" (0) if the Release file of the archive "
+#| "doesn't include a <literal>Valid-Until</literal> header. If it does then "
+#| "this date is the default. The date from the Release file or the date "
+#| "specified by the creation time of the Release file (<literal>Date</"
+#| "literal> header) plus the seconds specified with this options are used to "
+#| "check if the validation of a file has expired by using the earlier date "
+#| "of the two. Archive specific settings can be made by appending the label "
+#| "of the archive to the option name."
+msgid ""
+"Seconds the Release file should be considered valid after it was created "
+"(indicated by the <literal>Date</literal> header). If the Release file "
+"itself includes a <literal>Valid-Until</literal> header the earlier date of "
+"the two is used as the expiration date. The default value is <literal>0</"
+"literal> which stands for \"for ever\". Archive specific settings can be "
+"made by appending the label of the archive to the option name."
+msgstr ""
+"Sekunden, die die Release-Datei als gültig betrachtet werden sollte, nachdem "
+"sie erzeugt wurde. Vorgabe ist »für immer« (0), falls die Release-Datei des "
+"Archivs keine <literal>Valid-Until</literal>-Kopfzeile enthält. Falls dies "
+"so ist, ist dieses Datum vorgegeben. Das Datum aus der Release-Datei oder "
+"das Datum, das durch die Erstellungszeit der Release-Datei angegeben wurde "
+"(<literal>Date</literal>-Kopfzeile) plus die mit diesen Optionen angegebenen "
+"Sekunden werden benutzt, um zu prüfen, ob die Bestätigung einer Datei "
+"abgelaufen ist indem das neuere Datum der beiden benutzt wird. "
+"Archivspezifische Einstellungen können durch Anhängen des Archivetiketts an "
+"die Option »name« vorgenommen werden."
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:279
+#, fuzzy
+#| msgid "Max-ValidTime"
+msgid "Min-ValidTime"
+msgstr "Max-ValidTime"
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
+#, fuzzy
+#| msgid ""
+#| "Seconds the Release file should be considered valid after it was created. "
+#| "The default is \"for ever\" (0) if the Release file of the archive "
+#| "doesn't include a <literal>Valid-Until</literal> header. If it does then "
+#| "this date is the default. The date from the Release file or the date "
+#| "specified by the creation time of the Release file (<literal>Date</"
+#| "literal> header) plus the seconds specified with this options are used to "
+#| "check if the validation of a file has expired by using the earlier date "
+#| "of the two. Archive specific settings can be made by appending the label "
+#| "of the archive to the option name."
+msgid ""
+"Minimum of seconds the Release file should be considered valid after it was "
+"created (indicated by the <literal>Date</literal> header). Use this if you "
+"need to use a seldomly updated (local) mirror of a more regular updated "
+"archive with a <literal>Valid-Until</literal> header instead of competely "
+"disabling the expiration date checking. Archive specific settings can and "
+"should be used by appending the label of the archive to the option name."
msgstr ""
"Sekunden, die die Release-Datei als gültig betrachtet werden sollte, nachdem "
"sie erzeugt wurde. Vorgabe ist »für immer« (0), falls die Release-Datei des "
@@ -6040,12 +6283,12 @@ msgstr ""
"die Option »name« vorgenommen werden."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:290
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:274
+#: apt.conf.5.xml:291
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6055,12 +6298,20 @@ msgstr ""
"True."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:294
+#, fuzzy
+#| msgid ""
+#| "Two sub-options to limit the use of PDiffs are also available: With "
+#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
+#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+#| "other hand is the maximum percentage of the size of all patches compared "
+#| "to the size of the targeted file. If one of these limits is exceeded the "
+#| "complete file is downloaded instead of the patches."
msgid ""
"Two sub-options to limit the use of PDiffs are also available: With "
"<literal>FileLimit</literal> can be specified how many PDiff files are "
"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum precentage of the size of all patches compared to "
+"other hand is the maximum percentage of the size of all patches compared to "
"the size of the targeted file. If one of these limits is exceeded the "
"complete file is downloaded instead of the patches."
msgstr ""
@@ -6073,12 +6324,12 @@ msgstr ""
"der Patche heruntergeladen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:303
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:304
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6094,12 +6345,12 @@ msgstr ""
"URI-Art geöffnet wird."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:311
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#: apt.conf.5.xml:312
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6108,12 +6359,12 @@ msgstr ""
"APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:299
+#: apt.conf.5.xml:316
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:300
+#: apt.conf.5.xml:317
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6123,12 +6374,12 @@ msgstr ""
"kopiert zu werden. True ist die Vorgabe."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304 sources.list.5.xml:144
+#: apt.conf.5.xml:321 sources.list.5.xml:160
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:322
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6146,7 +6397,7 @@ msgstr ""
"die Umgebungsvariable <envar>http_proxy</envar> benutzt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#: apt.conf.5.xml:330
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6172,7 +6423,7 @@ msgstr ""
"unterstützt keine dieser Optionen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323 apt.conf.5.xml:387
+#: apt.conf.5.xml:340 apt.conf.5.xml:404
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6183,7 +6434,7 @@ msgstr ""
"Dinge, einschließlich Verbindungs- und Datenzeitüberschreitungen, angewandt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:343
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -6203,7 +6454,7 @@ msgstr ""
"gegen RFC 2068."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:351
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6219,7 +6470,7 @@ msgstr ""
"deaktiviert.)"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:339
+#: apt.conf.5.xml:356
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -6231,12 +6482,12 @@ msgstr ""
"bekannten Bezeichner verwendet."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:362
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:363
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -6251,7 +6502,7 @@ msgstr ""
"<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:352
+#: apt.conf.5.xml:369
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6290,12 +6541,12 @@ msgstr ""
"SslForceVersion</literal> ist die entsprechende per-Host-Option."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:370 sources.list.5.xml:155
+#: apt.conf.5.xml:387 sources.list.5.xml:171
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:388
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6330,7 +6581,7 @@ msgstr ""
"entsprechenden URI-Bestandteil genommen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:407
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -6347,7 +6598,7 @@ msgstr ""
"Beispielskonfiguration, um Beispiele zu erhalten)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:414
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6361,7 +6612,7 @@ msgstr ""
"Effizienz nicht empfohlen FTP über HTTP zu benutzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:419
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6377,18 +6628,18 @@ msgstr ""
"Server RFC2428 unterstützen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:409 sources.list.5.xml:137
+#: apt.conf.5.xml:426 sources.list.5.xml:153
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:415
+#: apt.conf.5.xml:432
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#: apt.conf.5.xml:427
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6410,12 +6661,12 @@ msgstr ""
"können per UMount angegeben werden."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:437
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:421
+#: apt.conf.5.xml:438
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6426,18 +6677,18 @@ msgstr ""
"Zusätzliche Parameter werden an gpgv weitergeleitet."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:443
msgid "CompressionTypes"
msgstr "CompressionTypes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:449
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:427
+#: apt.conf.5.xml:444
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6457,19 +6708,19 @@ msgstr ""
"\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:454
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:457
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:433
+#: apt.conf.5.xml:450
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6500,13 +6751,13 @@ msgstr ""
"explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:461
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:442
+#: apt.conf.5.xml:459
#, fuzzy
#| msgid ""
#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
@@ -6516,16 +6767,16 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#| "also that list entries specified on the command line 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 "
+#| "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."
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
"will only be used if this file exists, e.g. for the bzip2 method (the "
-"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
-"that list entries specified on the command line will be added at the end of "
-"the list specified in the configuration files, but before the default "
+"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+"also that list entries specified on the command line 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 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 "
@@ -6535,29 +6786,39 @@ msgstr ""
"replaceable></literal> zur Laufzeit geprüft wird: Falls diese Einstellung "
"existiert, wird die Methode nur benutzt, wenn die Datei existiert, z.B. für "
"die (integrierte) bzip2-Methode ist die Einstellung <placeholder type="
-"\"literallayout\" id=\"0\"/>. Beachten Sie, dass diese auf der Befehlszeile "
+"\"literallayout\" id=\"0\"/>. Beachten Sie auch, dass auf der Befehlszeile "
"eingegebenen Einträge an das Ende der Liste angehängt werden, die in den "
"Konfigurationsdateien angegeben wurde, aber vor den Vorgabeeinträgen. Um "
-"einen Eintrag in diesem Fall vor einem, über die in der Konfigurationsdatei "
-"angegebenen, zu bevorzugen, können Sie diese Option direkt setzen – nicht im "
-"Listenstil. Dies wird die definierte Liste nicht überschreiben, es wird "
-"diesen Typ nur vor die Liste setzen."
+"einen Typ in diesem Fall gegenüber einem, der über die Konfigurationsdatei "
+"angegebenen wurde, zu bevorzugen, können Sie diese Option direkt setzen – "
+"nicht im Listenstil. Dies wird die definierte Liste nicht überschreiben, es "
+"wird diesen Typ nur vor die Liste setzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:466
+#, fuzzy
+#| msgid ""
+#| "The special type <literal>uncompressed</literal> can be used to give "
+#| "uncompressed files a preference, but note that most archives don't "
+#| "provide uncompressed files so this is mostly only useable for local "
+#| "mirrors."
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
"uncompressed files so this is mostly only useable for local mirrors."
msgstr ""
+"Der besondere Typ <literal>uncompressed</literal> kann benutzt werden, um "
+"unkomprimierten Dateien einen Vorrang zu geben, beachten Sie jedoch, dass "
+"die meisten Archive keine unkomprimierten Dateien bereitstellen, so dass "
+"dies meist nur für lokale Spiegel benutzt werden kann."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:454
+#: apt.conf.5.xml:471
msgid "GzipIndexes"
msgstr "GzipIndexes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:473
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -6571,12 +6832,12 @@ msgstr ""
"False."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:463
+#: apt.conf.5.xml:480
msgid "Languages"
msgstr "Sprachen"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:481
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
@@ -6598,13 +6859,13 @@ msgstr ""
"hier unmögliche Werte einsetzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:480
+#: apt.conf.5.xml:497
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:487
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -6646,7 +6907,7 @@ msgstr ""
"Reihenfolge »fr, de, en«. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:253
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6656,12 +6917,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:487
+#: apt.conf.5.xml:504
msgid "Directories"
msgstr "Verzeichnisse"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:506
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6681,7 +6942,7 @@ msgstr ""
"filename> oder <filename>./</filename> beginnen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:513
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6704,7 +6965,7 @@ msgstr ""
"in <literal>Dir::Cache</literal> enthalten."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:522
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6719,7 +6980,7 @@ msgstr ""
"Konfigurationsdatei erfolgt)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:528
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -6731,7 +6992,7 @@ msgstr ""
"geladen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:532
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6749,7 +7010,7 @@ msgstr ""
"Programms an."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:540
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6769,7 +7030,7 @@ msgstr ""
"<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:553
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -6787,12 +7048,12 @@ msgstr ""
"verwandt werden."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:562
msgid "APT in DSelect"
msgstr "APT in DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:564
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6803,12 +7064,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:551
+#: apt.conf.5.xml:568
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:569
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6826,7 +7087,7 @@ msgstr ""
"führt diese Aktion vor dem Herunterladen neuer Pakete durch."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:578
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6835,12 +7096,12 @@ msgstr ""
"übermittelt, wenn es für die Installationsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:582
msgid "Updateoptions"
msgstr "Updateoptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:583
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6849,12 +7110,12 @@ msgstr ""
"übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:587
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:588
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6863,12 +7124,12 @@ msgstr ""
"nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:594
msgid "How APT calls dpkg"
msgstr "Wie APT Dpkg aufruft"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:595
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6877,7 +7138,7 @@ msgstr ""
"stehen im Abschnitt <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:583
+#: apt.conf.5.xml:600
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -6888,17 +7149,17 @@ msgstr ""
"jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:606
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6912,12 +7173,12 @@ msgstr ""
"APT abgebrochen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:612
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:613
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6934,7 +7195,7 @@ msgstr ""
"pro Zeile."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:619
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6950,12 +7211,12 @@ msgstr ""
"literal> gegeben wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:626
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:627
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6964,12 +7225,12 @@ msgstr ""
"die Vorgabe ist <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:631
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:615
+#: apt.conf.5.xml:632
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6979,25 +7240,12 @@ msgstr ""
"Programme werden erstellt."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:637
msgid "dpkg trigger usage (and related options)"
msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:621
-#, fuzzy
-#| msgid ""
-#| "APT can call dpkg in a way so it can make aggressive use of triggers over "
-#| "multiply calls of dpkg. Without further options dpkg will use triggers "
-#| "only in between his own run. Activating these options can therefore "
-#| "decrease the time needed to perform the install / upgrade. Note that it "
-#| "is intended to activate these options per default in the future, but as "
-#| "it changes the way APT calling dpkg drastically it needs a lot more "
-#| "testing. <emphasis>These options are therefore currently experimental "
-#| "and should not be used in productive environments.</emphasis> Also it "
-#| "breaks the progress reporting so all frontends will currently stay around "
-#| "half (or more) of the time in the 100% state while it actually configures "
-#| "all packages."
+#: apt.conf.5.xml:638
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiple calls of dpkg. Without further options dpkg will use triggers only "
@@ -7010,20 +7258,21 @@ msgid ""
"all frontends will currently stay around half (or more) of the time in the "
"100% state while it actually configures all packages."
msgstr ""
-"APT kann Dpkg auf eine Art aufrufen, auf die aggressiv Gebrauch von Triggern "
-"über mehrere Dpkg-Aufrufe gemacht wird. Ohne weitere Optionen wird Dpkg "
-"Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen zu "
-"benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit verkürzen. "
-"Beachten Sie, dass geplant ist, diese Optionen in Zukunft standardmäßig zu "
-"aktivieren, aber da es die Art, wie APT Dpkg aufruft, drastisch ändert, "
-"benötigt es noch viele weitere Tests. <emphasis>Diese Optionen sind daher "
-"aktuell noch experimentell und sollten nicht in produktiven Umgebungen "
-"benutzt werden.</emphasis> Außerdem unterbricht es die Fortschrittsanzeige, "
-"so dass alle Oberflächen aktuell in der halben (oder mehr) Zeit auf dem "
-"Status 100% stehen, während es aktuell alle Pakete konfiguriert."
+"APT kann Dpkg auf eine Art aufrufen, in der aggressiv Gebrauch von Triggern "
+"über mehrere Dpkg-Aufrufe hinweg gemacht wird. Ohne weitere Optionen wird "
+"Dpkg Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen "
+"zu benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit "
+"verkürzen. Beachten Sie, dass geplant ist, diese Optionen in Zukunft "
+"standardmäßig zu aktivieren, aber da es die Art, wie APT Dpkg aufruft, "
+"drastisch ändert, benötigt es noch viele weitere Tests. <emphasis>Diese "
+"Optionen sind daher aktuell noch experimentell und sollten nicht in "
+"produktiven Umgebungen benutzt werden.</emphasis> Außerdem unterbricht es "
+"die Fortschrittsanzeige, so dass alle Oberflächen derzeit die halbe (oder "
+"mehr) Zeit auf dem Status 100% stehen, während tatsächlich alle Pakete "
+"konfiguriert werden."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:653
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -7037,7 +7286,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:647
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -7062,12 +7311,12 @@ msgstr ""
"wäre <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:642
+#: apt.conf.5.xml:659
msgid "DPkg::NoTriggers"
msgstr "DPkg::NoTriggers"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:660
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -7088,12 +7337,12 @@ msgstr ""
"außerdem an die »unpack«- und »remove«-Aufrufe anhängen."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:650
+#: apt.conf.5.xml:667
msgid "PackageManager::Configure"
msgstr "PackageManager::Configure"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:668
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7122,12 +7371,12 @@ msgstr ""
"mehr startbar sein könnte."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:678
msgid "DPkg::ConfigurePending"
msgstr "DPkg::ConfigurePending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:662
+#: apt.conf.5.xml:679
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -7146,12 +7395,12 @@ msgstr ""
"deaktivieren."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:685
msgid "DPkg::TriggersPending"
msgstr "DPkg::TriggersPending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:669
+#: apt.conf.5.xml:686
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7167,12 +7416,12 @@ msgstr ""
"benötigt werden."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:691
msgid "PackageManager::UnpackAll"
msgstr "PackageManager::UnpackAll"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:675
+#: apt.conf.5.xml:692
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-"
@@ -7191,12 +7440,12 @@ msgstr ""
"und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:699
msgid "OrderList::Score::Immediate"
msgstr "OrderList::Score::Immediate"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:707
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7214,7 +7463,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:700
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 "
@@ -7238,12 +7487,12 @@ msgstr ""
"mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:720
msgid "Periodic and Archives options"
msgstr "Periodische- und Archivoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:721
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7257,12 +7506,12 @@ msgstr ""
"Dokumentation dieser Optionen zu erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:729
msgid "Debug options"
msgstr "Fehlersuchoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:731
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7280,7 +7529,7 @@ msgstr ""
"könnten es sein:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:742
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7291,7 +7540,7 @@ msgstr ""
"getroffenen Entscheidungen ein."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:750
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7302,7 +7551,7 @@ msgstr ""
"<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:759
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7314,7 +7563,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:750
+#: apt.conf.5.xml:767
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -7323,17 +7572,17 @@ msgstr ""
"Daten in CD-ROM-IDs aus."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:777
msgid "A full list of debugging options to apt follows."
msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:782
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:769
+#: apt.conf.5.xml:786
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -7341,48 +7590,48 @@ msgstr ""
"literal>-Quellen beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:793
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:780
+#: apt.conf.5.xml:797
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:787
+#: apt.conf.5.xml:804
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:791
+#: apt.conf.5.xml:808
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:815
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:802
+#: apt.conf.5.xml:819
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
"Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:826
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:813
+#: apt.conf.5.xml:830
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7391,12 +7640,12 @@ msgstr ""
"mittels <literal>gpg</literal> beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:820
+#: apt.conf.5.xml:837
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:841
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -7405,23 +7654,23 @@ msgstr ""
"CD-ROMs gespeichert sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:848
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:851
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:858
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:861
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7430,12 +7679,12 @@ msgstr ""
"Bibliotheken generiert wurde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:868
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:871
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 "
@@ -7446,12 +7695,12 @@ msgstr ""
"ID für eine CD-ROM generiert wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:879
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:882
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."
@@ -7461,24 +7710,24 @@ msgstr ""
"gleichen Zeit laufen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:873
+#: apt.conf.5.xml:890
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:894
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Protokollieren, wenn Elemente aus der globalen Warteschlange zum "
"Herunterladen hinzugefügt oder entfernt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:884
+#: apt.conf.5.xml:901
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:887
+#: apt.conf.5.xml:904
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7487,12 +7736,12 @@ msgstr ""
"und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:894
+#: apt.conf.5.xml:911
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:897
+#: apt.conf.5.xml:914
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7501,12 +7750,12 @@ msgstr ""
"und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:905
+#: apt.conf.5.xml:922
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:909
+#: apt.conf.5.xml:926
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7516,12 +7765,12 @@ msgstr ""
"werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:916
+#: apt.conf.5.xml:933
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:920
+#: apt.conf.5.xml:937
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -7529,12 +7778,12 @@ msgstr ""
"durchführen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:927
+#: apt.conf.5.xml:944
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:948
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7544,12 +7793,12 @@ msgstr ""
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:955
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:941
+#: apt.conf.5.xml:958
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7565,12 +7814,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:969
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:955
+#: apt.conf.5.xml:972
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7602,23 +7851,23 @@ msgstr ""
"erscheint."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:991
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:994
msgid "Dump the default configuration to standard error on startup."
msgstr ""
"Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:984
+#: apt.conf.5.xml:1001
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:987
+#: apt.conf.5.xml:1004
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7628,12 +7877,12 @@ msgstr ""
"sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1012
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:998
+#: apt.conf.5.xml:1015
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7642,12 +7891,12 @@ msgstr ""
"alle während deren Auswertung gefundenen Fehler ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1022
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1009
+#: apt.conf.5.xml:1026
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7657,12 +7906,12 @@ msgstr ""
"soll."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1034
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1021
+#: apt.conf.5.xml:1038
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -7670,22 +7919,22 @@ msgstr ""
"von &dpkg; ausgeführt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1028
+#: apt.conf.5.xml:1045
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1032
+#: apt.conf.5.xml:1049
msgid "Output the priority of each package list on startup."
msgstr "Die Priorität jeder Paketliste beim Start ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1055
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1042
+#: apt.conf.5.xml:1059
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7695,12 +7944,12 @@ msgstr ""
"aufgetreten ist)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1050
+#: apt.conf.5.xml:1067
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:1053
+#: apt.conf.5.xml:1070
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 "
@@ -7712,12 +7961,12 @@ msgstr ""
"beschrieben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1078
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1065
+#: apt.conf.5.xml:1082
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7726,7 +7975,7 @@ msgstr ""
"gelesenen Anbieter ausgeben."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1088
+#: apt.conf.5.xml:1105
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7735,13 +7984,13 @@ msgstr ""
"möglichen Optionen zeigen."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1112
msgid "&file-aptconf;"
msgstr "&file-aptconf;"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1100
+#: apt.conf.5.xml:1117
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7846,23 +8095,28 @@ msgstr ""
#| "directory are parsed in alphanumeric ascending order and need to obey the "
#| "following naming convention: The files have no or \"<literal>pref</"
#| "literal>\" as filename extension and which only contain alphanumeric, "
-#| "hyphen (-), underscore (_) and period (.) characters - otherwise they "
-#| "will be silently ignored."
+#| "hyphen (-), underscore (_) and period (.) characters. Otherwise APT will "
+#| "print a notice that it has ignored a file if the file doesn't match a "
+#| "pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+#| "configuration list - in this case it will be silently ignored."
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
-"following naming convention: The files have no or \"<literal>pref</literal>"
-"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
"that it has ignored a file if the file doesn't match a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
"case it will be silently ignored."
msgstr ""
-"Beachten Sie, dass die Dateien im Verzeichnis /etc/apt/preferences.d in "
-"alphanumerisch aufsteigender Richtung ausgewertet werden und der folgenden "
-"Namenskonvention unterliegen: Die Dateien haben keine oder »pref« als "
-"Dateierweiterung und sie enthalten nur alphanumerische Zeichen, Bindestriche "
-"(-), Unterstriche (_) oder Punkte (.). Wenn dies nicht der Fall ist, werden "
+"Beachten Sie, dass die Dateien im Verzeichnis <filename>/etc/apt/preferences."
+"d</filename> in alphanumerisch aufsteigender Reihenfolge ausgewertet werden "
+"und der folgenden Namenskonvention unterliegen: Die Dateien haben keine oder "
+"<literal>»pref«</literal> als Dateierweiterung und sie enthalten nur "
+"alphanumerische Zeichen, Bindestriche (-), Unterstriche (_) oder Punkte (.). "
+"Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert "
+"hat, falls die Datei nicht auf ein Muster in der Konfigurationsliste "
+"<literal>Dir::Ignore-Files-Silently</literal> passt – in diesem Fall wird "
"sie stillschweigend ignoriert."
#. type: Content of: <refentry><refsect1><refsect2><title>
@@ -7920,17 +8174,19 @@ msgstr "Priorität 1"
#, fuzzy
#| msgid ""
#| "to the versions coming from archives which in their <filename>Release</"
-#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
-#| "experimental archive."
+#| "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
+#| "emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+#| "<literal>experimental</literal> archive."
msgid ""
"to the versions coming from archives which in their <filename>Release</"
"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
"<literal>experimental</literal> archive."
msgstr ""
-"zu den Versionen, die von Archiven kommen, deren <filename>Release</"
-"filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-"
-"Experimental-Archiv."
+"zu den Versionen, die von Archiven kommen, die in deren <filename>Release</"
+"filename>-Dateien als »NotAutomatic: yes« markiert sind, aber "
+"<emphasis>nicht</emphasis> als »ButAutomaticUpgrades: yes« wie das Archiv "
+"<literal>experimental</literal> von Debian."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:113
@@ -7939,20 +8195,17 @@ msgstr "Priorität 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:114
-#, fuzzy
-#| msgid ""
-#| "to the versions coming from archives which in their <filename>Release</"
-#| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
-#| "experimental archive."
msgid ""
"to the version that is already installed (if any) and to the versions coming "
"from archives which in their <filename>Release</filename> files are marked "
"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
"backports archive since <literal>squeeze-backports</literal>."
msgstr ""
-"zu den Versionen, die von Archiven kommen, deren <filename>Release</"
-"filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-"
-"Experimental-Archiv."
+"zu der Version, die bereits installiert ist (wenn dies der Fall ist) und zu "
+"Versionen, die von Archiven kommen, die in deren <filename>Release</"
+"filename>-Dateien als »NotAutomatic: yes« und »ButAutomaticUpgrades: yes« "
+"markiert sind, wie das Debian-Backports-Archiv seit <literal>squeeze-"
+"backports</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:121
@@ -7997,9 +8250,10 @@ msgstr ""
#| msgid ""
#| "If the target release has not been specified then APT simply assigns "
#| "priority 100 to all installed package versions and priority 500 to all "
-#| "uninstalled package versions, expect versions coming from archives which "
+#| "uninstalled package versions, except versions coming from archives which "
#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: "
-#| "yes\" - these versions get the priority 1."
+#| "yes\" - these versions get the priority 1 or priority 100 if it is "
+#| "additionally marked as \"ButAutomaticUpgrades: yes\"."
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -8011,8 +8265,10 @@ msgstr ""
"Wenn das Ziel-Release nicht angegeben wurde, dann weist APT einfach allen "
"installierten Paketversionen eine Priorität von 100 und allen nicht "
"installierten Paketversionen eine Priorität von 500 zu, außer wenn Versionen "
-"aus Archiven kommen, in deren Release-Dateien »NotAutomatic: yes« markiert "
-"ist – diese Versionen erhalten die Prirität 1."
+"aus Archiven kommen, die in deren <filename>Release<filename>-Dateien "
+"»NotAutomatic: yes« markiert sind – diese Versionen erhalten die Priorität 1 "
+"oder die Priorität 100, falls sie zusätzlich als »ButAutomaticUpgrades: yes« "
+"markiert sind."
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:139
@@ -8312,17 +8568,95 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr "Reguläre Ausdrücke und glob()-Syntax"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+#, fuzzy
+#| msgid ""
+#| "APT also supports pinning by glob() expressions and regular expressions "
+#| "surrounded by /. For example, the following example assigns the priority "
+#| "500 to all packages from experimental where the name starts with gnome "
+#| "(as a glob()-like expression) or contains the word kde (as a POSIX "
+#| "extended regular expression surrounded by slashes)."
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+"APT unterstützt außerdem Pinning mittels glob()-Ausdrücken und regulären "
+"Ausdrücken, die von »/« umschlossen sind. Das folgende Beispiel weist "
+"beispielsweise allen Paketen aus Experimental die Priorität 500 zu, bei "
+"denen der Name mit »gnome« beginnt (wie ein glob()-artiger Ausdruck) oder "
+"das Wort »kde« enthält (wie ein erweiterter regulärer POSIX-Ausdruck, der "
+"von Schrägstrichen umschlossen wird)."
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, no-wrap
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+#, fuzzy
+#| msgid ""
+#| "The rule for those expressions is that they can occur anywhere where a "
+#| "string can occur. Thus, the following pin assigns the priority 990 to all "
+#| "packages from a release starting with karmic."
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+"Die Regel für diese Ausdrücke ist, dass sie überall dort auftreten können, "
+"wo eine Zeichenkette auftreten kann. Somit weist die folgende Pin allen "
+"Paketen von einem Release seit Karmic die Priorität 900 zu."
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+msgid "Package"
+msgstr "Package"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr "*"
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
msgid "How APT Interprets Priorities"
msgstr "Wie APT Prioritäten interpretiert"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:314
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:315
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8331,12 +8665,12 @@ msgstr ""
"des Pakets durchführt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:319
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8345,12 +8679,12 @@ msgstr ""
"Ziel-Release kommt, außer wenn die installierte Version aktueller ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:325
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:326
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8360,12 +8694,12 @@ msgstr ""
"neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:288
+#: apt_preferences.5.xml:331
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:332
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8375,12 +8709,12 @@ msgstr ""
"installierte Version neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:337
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:338
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8389,17 +8723,17 @@ msgstr ""
"installierte Version des Pakets gibt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:342
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:343
msgid "prevents the version from being installed"
msgstr "verhindert das Installieren der Version"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:309
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8410,7 +8744,7 @@ msgstr ""
"(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:348
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8424,7 +8758,7 @@ msgstr ""
"erste dieser Datensätze die Priorität der Paketversion fest."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:354
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8433,7 +8767,7 @@ msgstr ""
"bereits gezeigten Datensätze:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:358
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8461,12 +8795,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:371
msgid "Then:"
msgstr "Dann:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:373
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8481,7 +8815,7 @@ msgstr ""
"dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:378
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8492,7 +8826,7 @@ msgstr ""
"sogar wenn diese Versionen zum Ziel-Release gehören."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:382
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8506,12 +8840,12 @@ msgstr ""
"Pakets installiert ist."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:392
msgid "Determination of Package Version and Distribution Properties"
msgstr "Festlegung von Paketversion und Distributions-Eigenschaften"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:394
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8522,27 +8856,27 @@ msgstr ""
"bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:406
msgid "the <literal>Package:</literal> line"
msgstr "die <literal>Package:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:364
+#: apt_preferences.5.xml:407
msgid "gives the package name"
msgstr "gibt den Paketnamen an"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
msgid "the <literal>Version:</literal> line"
msgstr "die <literal>Version:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:411
msgid "gives the version number for the named package"
msgstr "gibt die Versionsnummer für das genannte Paket an"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:398
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8563,12 +8897,12 @@ msgstr ""
"Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:427
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:428
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8585,18 +8919,18 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:438
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:444
msgid "the <literal>Codename:</literal> line"
msgstr "die <literal>Codename:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:445
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -8613,13 +8947,13 @@ msgstr ""
"anzugeben würde die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:454
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:461
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8635,7 +8969,7 @@ msgstr ""
"eine der folgenden Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:470
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8647,12 +8981,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:479
msgid "the <literal>Component:</literal> line"
msgstr "die <literal>Component:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:480
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8670,18 +9004,18 @@ msgstr ""
"Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:446
+#: apt_preferences.5.xml:489
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:452
+#: apt_preferences.5.xml:495
msgid "the <literal>Origin:</literal> line"
msgstr "die <literal>Origin:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:453
+#: apt_preferences.5.xml:496
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8693,18 +9027,18 @@ msgstr ""
"in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:459
+#: apt_preferences.5.xml:502
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:465
+#: apt_preferences.5.xml:508
msgid "the <literal>Label:</literal> line"
msgstr "die <literal>Label:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:509
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8717,13 +9051,13 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:515
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:416
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8746,7 +9080,7 @@ msgstr ""
"APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:522
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8772,12 +9106,12 @@ msgstr ""
"Distribution heruntergeladen wurde."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:535
msgid "Optional Lines in an APT Preferences Record"
msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:494
+#: apt_preferences.5.xml:537
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8788,12 +9122,12 @@ msgstr ""
"anfangen. Dieses stellt einen Platz für Kommentare bereit."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:503
+#: apt_preferences.5.xml:546
msgid "Tracking Stable"
msgstr "Stable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:554
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8817,7 +9151,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8832,8 +9166,8 @@ msgstr ""
"Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8845,7 +9179,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:566
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8858,13 +9192,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:583
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:577
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8878,12 +9212,12 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:589
msgid "Tracking Testing or Unstable"
msgstr "Testing oder Unstable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:555
+#: apt_preferences.5.xml:598
#, no-wrap
msgid ""
"Package: *\n"
@@ -8911,7 +9245,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:591
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8928,7 +9262,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:612
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8941,13 +9275,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:632
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:623
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -8967,12 +9301,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:596
+#: apt_preferences.5.xml:639
msgid "Tracking the evolution of a codename release"
msgstr "Die Entwicklung eines Codename-Releases verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:610
+#: apt_preferences.5.xml:653
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9007,7 +9341,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:641
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9033,7 +9367,7 @@ msgstr ""
"benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:670
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9046,13 +9380,13 @@ msgstr ""
"literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:647
+#: apt_preferences.5.xml:690
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:681
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9072,12 +9406,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:699
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:662
+#: apt_preferences.5.xml:705
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -9135,14 +9469,6 @@ msgstr "sources.list.d"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:54
-#, fuzzy
-#| msgid ""
-#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
-#| "to add sources.list entries in separate files. The format is the same as "
-#| "for the regular <filename>sources.list</filename> file. File names need "
-#| "to end with <filename>.list</filename> and may only contain letters (a-z "
-#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
-#| "characters. Otherwise they will be silently ignored."
msgid ""
"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
"add sources.list entries in separate files. The format is the same as for "
@@ -9158,8 +9484,10 @@ msgstr ""
"Das Format ist das gleiche wie für die normale <filename>sources.list</"
"filename>-Datei. Dateinamen müssen mit <filename>.list</filename> enden und "
"können nur Buchstaben (a-z und A-Z), Ziffern (0-9), Unterstriche (_), "
-"Bindestriche (-) und Punkte (.) enthalten. Ansonsten werden sie "
-"stillschweigend ignoriert."
+"Bindestriche (-) und Punkte (.) enthalten. Andernfalls wird APT einen "
+"Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die Datei nicht "
+"auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-Files-"
+"Silently</literal> passt – in diesem Fall wird sie stillschweigend ignoriert."
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml:65
@@ -9168,17 +9496,6 @@ msgstr "Die Typen deb und deb-src"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:66
-#, fuzzy
-#| msgid ""
-#| "The <literal>deb</literal> type describes a typical two-level Debian "
-#| "archive, <filename>distribution/component</filename>. Typically, "
-#| "<literal>distribution</literal> is generally one of <literal>stable</"
-#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
-#| "component is one of <literal>main</literal> <literal>contrib</literal> "
-#| "<literal>non-free</literal> or <literal>non-us</literal>. The "
-#| "<literal>deb-src</literal> type describes a debian distribution's source "
-#| "code in the same form as the <literal>deb</literal> type. A <literal>deb-"
-#| "src</literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
@@ -9193,14 +9510,14 @@ msgid ""
msgstr ""
"Der <literal>deb</literal>-Typ beschreibt ein typisches zweistufiges Debian-"
"Archiv, <filename>Distribution/Komponente</filename>. <literal>Distribution</"
-"literal> ist typischerweise entweder <literal>stable</literal>, "
-"<literal>unstable</literal> oder <literal>testing</literal>, während "
-"Komponente entweder <literal>main</literal>, <literal>contrib</literal>, "
-"<literal>non-free</literal> oder <literal>non-us</literal> ist. Der "
-"<literal>deb-src</literal>-Typ beschreibt einen Quellcode einer Debian-"
-"Distribution in der gleichen Form wie den <literal>deb</literal>-Typ. Eine "
-"<literal>deb-src</literal>-Zeile wird benötigt, um Quellindizes "
-"herunterzuladen."
+"literal> ist typischerweise ein Archivname wie <literal>stable</literal> "
+"oder <literal>testing</literal> oder ein Kodename wie <literal>&stable-"
+"codename;</literal> oder <literal>&testing-codename;</literal> während "
+"Komponente entweder <literal>main</literal>, <literal>contrib</literal> oder "
+"<literal>non-free</literal> ist. Der <literal>deb-src</literal>-Typ "
+"beschreibt den Quellcode einer Debian-Distribution in der gleichen Form wie "
+"den <literal>deb</literal>-Typ. Eine <literal>deb-src</literal>-Zeile wird "
+"benötigt, um Quellindizes herunterzuladen."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
@@ -9213,8 +9530,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:81
-#, no-wrap
-msgid "deb uri distribution [component1] [component2] [...]"
+#, fuzzy, no-wrap
+#| msgid "deb uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri distribution [component1] [component2] [...]"
msgstr "deb URI Distribution [Komponente1] [Komponente2] [...]"
#. type: Content of: <refentry><refsect1><para>
@@ -9286,6 +9604,38 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:112
msgid ""
+"<literal>options</literal> is always optional and needs to be surounded by "
+"square brackets. It can consist of multiple settings in the form "
+"<literal><replaceable>setting</replaceable>=<replaceable>value</"
+"replaceable></literal>. Multiple settings are separated by spaces. The "
+"following settings are supported by APT, note through that unsupported "
+"settings will be ignored silently:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:117
+msgid ""
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> can be used to specify for which architectures "
+"packages information should be downloaded. If this option is not set all "
+"architectures defined by the <literal>APT::Architectures</literal> option "
+"will be downloaded."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:128
+msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@ -9298,12 +9648,12 @@ msgstr ""
"Rechnern, zum Beispiel)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:133
msgid "Some examples:"
msgstr "Einige Beispiele:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:119
+#: sources.list.5.xml:135
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -9315,17 +9665,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:125
+#: sources.list.5.xml:141
msgid "URI specification"
msgstr "URI-Beschreibung"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:146
msgid "file"
msgstr "file"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:132
+#: sources.list.5.xml:148
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -9336,7 +9686,7 @@ msgstr ""
"lokale Spiegel oder Archive."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:155
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -9346,7 +9696,7 @@ msgstr ""
"der Quellenliste zu erstellen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:162
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9363,7 +9713,7 @@ msgstr ""
"Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:173
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -9383,12 +9733,12 @@ msgstr ""
"Konfigurationsdatei HTTP benutzen, werden ignoriert."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:182
msgid "copy"
msgstr "copy"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:184
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -9400,17 +9750,17 @@ msgstr ""
"Platte benutzen, um Dateien mit APT umherzukopieren."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "rsh"
msgstr "rsh"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "ssh"
msgstr "ssh"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:191
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -9426,12 +9776,12 @@ msgstr ""
"aus der Ferne durchzuführen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:199
msgid "more recognizable URI types"
msgstr "weitere erkennbare URI-Typen"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:185
+#: sources.list.5.xml:201
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
@@ -9453,7 +9803,7 @@ msgstr ""
"citerefentry>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:143
msgid ""
"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -9462,7 +9812,7 @@ msgstr ""
"»ssh«, »rsh«. <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:215
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -9471,37 +9821,60 @@ msgstr ""
"jason/debian für stable/main, stable/contrib und stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:203
+#: sources.list.5.xml:219
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution "
"benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:220
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:222
msgid "Source line for the above"
msgstr "Quellzeile für obiges"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:223
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:209
+#: sources.list.5.xml:225
+msgid ""
+"The first line gets package information for the architectures in "
+"<literal>APT::Architectures</literal> while the second always retrieves "
+"<literal>amd64</literal> and <literal>armel</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:227
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#| " "
+msgid ""
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgstr ""
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+" "
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:230
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -9510,13 +9883,13 @@ msgstr ""
"den hamm/main-Bereich zu benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:211
+#: sources.list.5.xml:232
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:234
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -9526,13 +9899,13 @@ msgstr ""
"benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:236
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:238
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -9546,29 +9919,19 @@ msgstr ""
"für beide Quellzeilen benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:230
-#, fuzzy, no-wrap
-#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+#: sources.list.5.xml:251
+#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
-msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:223
-#, fuzzy
-#| msgid ""
-#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
-#| "US directory, and uses only files found under <filename>unstable/binary-"
-#| "i386</filename> on i386 machines, <filename>unstable/binary-m68k</"
-#| "filename> on m68k, and so forth for other supported architectures. [Note "
-#| "this example only illustrates how to use the substitution variable; non-"
-#| "us is no longer structured like this] <placeholder type=\"literallayout\" "
-#| "id=\"0\"/>"
+#: sources.list.5.xml:244
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -9578,17 +9941,17 @@ msgid ""
"archives are not structured like this] <placeholder type=\"literallayout\" "
"id=\"0\"/>"
msgstr ""
-"Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-US-"
+"Benutzt HTTP, um auf das Archiv auf ftp.tlh.debian.org unter dem universe-"
"Verzeichnis zuzugreifen und benutzt nur Dateien, die unter "
"<filename>unstable/binary-i386</filename> auf i386-Maschinen, "
-"<filename>unstable/binary-m68k</filename> auf m68k und so weiter für andere "
-"unterstützte Architekturen, gefunden werden. [Beachten Sie, dass dieses "
-"Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt wird. "
-"»non-us« ist nicht länger so strukturiert] <placeholder type=\"literallayout"
-"\" id=\"0\"/>"
+"<filename>unstable/binary-amd64</filename> auf amd64 und so weiter für "
+"andere unterstützte Architekturen, gefunden werden. [Beachten Sie, dass "
+"dieses Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt "
+"wird. Offizielle Debian-Archive sind nicht so strukturiert.] <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:256
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
@@ -11145,6 +11508,47 @@ msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
+#~ msgid ""
+#~ "Update the local keyring with the keyring of Debian archive keys and "
+#~ "removes from the keyring the archive keys which are no longer valid."
+#~ msgstr ""
+#~ "Den lokalen Schlüsselbund mit dem Schlüsselbund der Debian-"
+#~ "Archivschlüssel aktualisieren und aus dem Schlüsselbund die "
+#~ "Archivschlüssel entfernen, die nicht länger gültig sind."
+
+#, fuzzy
+#~| msgid ""
+#~| "Seconds the Release file should be considered valid after it was "
+#~| "created. The default is \"for ever\" (0) if the Release file of the "
+#~| "archive doesn't include a <literal>Valid-Until</literal> header. If it "
+#~| "does then this date is the default. The date from the Release file or "
+#~| "the date specified by the creation time of the Release file "
+#~| "(<literal>Date</literal> header) plus the seconds specified with this "
+#~| "options are used to check if the validation of a file has expired by "
+#~| "using the earlier date of the two. Archive specific settings can be made "
+#~| "by appending the label of the archive to the option name."
+#~ msgid ""
+#~ "Seconds the Release file should be considered valid after it was created. "
+#~ "The default is \"for ever\" (0) if the Release file of the archive "
+#~ "doesn't include a <literal>Valid-Until</literal> header. If it does then "
+#~ "this date is the default. The date from the Release file or the date "
+#~ "specified by the creation time of the Release file (<literal>Date</"
+#~ "literal> header) plus the seconds specified with this options are used to "
+#~ "check if the validation of a file has expired by using the earlier date "
+#~ "of the two. Archive specific settings can be made by appending the label "
+#~ "of the archive to the option name."
+#~ msgstr ""
+#~ "Sekunden, die die Release-Datei als gültig betrachtet werden sollte, "
+#~ "nachdem sie erzeugt wurde. Vorgabe ist »für immer« (0), falls die Release-"
+#~ "Datei des Archivs keine <literal>Valid-Until</literal>-Kopfzeile enthält. "
+#~ "Falls dies so ist, ist dieses Datum vorgegeben. Das Datum aus der Release-"
+#~ "Datei oder das Datum, das durch die Erstellungszeit der Release-Datei "
+#~ "angegeben wurde (<literal>Date</literal>-Kopfzeile) plus die mit diesen "
+#~ "Optionen angegebenen Sekunden werden benutzt, um zu prüfen, ob die "
+#~ "Bestätigung einer Datei abgelaufen ist indem das neuere Datum der beiden "
+#~ "benutzt wird. Archivspezifische Einstellungen können durch Anhängen des "
+#~ "Archivetiketts an die Option »name« vorgenommen werden."
+
#~ msgid "<option>--md5</option>"
#~ msgstr "<option>--md5</option>"
@@ -11158,6 +11562,27 @@ msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
#~ "möglich ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</"
#~ "literal>"
+#~ msgid "unmarkauto"
+#~ msgstr "unmarkauto"
+
+#~ msgid "<option>-h</option>"
+#~ msgstr "<option>-h</option>"
+
+#~ msgid "<option>--help</option>"
+#~ msgstr "<option>--help</option>"
+
+#~ msgid "Show a short usage summary."
+#~ msgstr "Eine kurze Zusammenfassung anzeigen."
+
+#~ msgid "<option>-v</option>"
+#~ msgstr "<option>-v</option>"
+
+#~ msgid "<option>--version</option>"
+#~ msgstr "<option>--version</option>"
+
+#~ msgid "Show the program version."
+#~ msgstr "Die Programmversion anzeigen."
+
#~ msgid "to the version that is already installed (if any)."
#~ msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)."
diff --git a/doc/po/es.po b/doc/po/es.po
index 6b9b667e2..652d7d025 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -36,7 +36,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25\n"
-"POT-Creation-Date: 2011-04-05 10:22+0300\n"
+"POT-Creation-Date: 2011-11-10 16:42+0100\n"
"PO-Revision-Date: 2010-08-25 03:25+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -809,8 +809,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
msgid "Description"
@@ -830,7 +830,7 @@ msgstr ""
"genera información interesante a partir de los metadatos del paquete."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:120
+#: apt-cache.8.xml:70 apt-get.8.xml:127
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -1327,8 +1327,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
+#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
msgid "options"
msgstr "Opciones"
@@ -1354,7 +1354,7 @@ msgstr ""
"configuración: <literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
#: apt-sortpkgs.1.xml:61
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1380,12 +1380,12 @@ msgstr ""
"Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1466,9 +1466,16 @@ msgstr "<option>--no-enhances</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:317
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be twicked with these flags "
+#| "which will omit the specified dependency type. Configuration Item: "
+#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be twicked with these flags which will omit "
+"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
"Cache::ShowRecommends</literal>."
@@ -1481,7 +1488,7 @@ msgstr ""
"<literal>APT::Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
+#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
msgid "<option>-f</option>"
msgstr "<option>-f</option>"
@@ -1500,7 +1507,8 @@ msgstr ""
"Opción de configuración: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+#: apt-get.8.xml:452
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -1617,14 +1625,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:596
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
+#: apt-cache.8.xml:372 apt-get.8.xml:601 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt.conf.5.xml:1110 apt_preferences.5.xml:697
msgid "Files"
msgstr "Ficheros"
@@ -1635,10 +1643,10 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
-#: sources.list.5.xml:234
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:611
+#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
msgid "See Also"
msgstr "Véase también"
@@ -1649,8 +1657,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:617
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "Diagnósticos"
@@ -1779,12 +1787,12 @@ msgstr ""
"option>. <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:161
msgid "Options"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -1828,7 +1836,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:364
+#: apt-cdrom.8.xml:116 apt-get.8.xml:375
msgid "<option>-m</option>"
msgstr "<option>-m</option>"
@@ -1883,17 +1891,17 @@ msgstr ""
"pero encontrará todo el contenido."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:395
+#: apt-cdrom.8.xml:143 apt-get.8.xml:406
msgid "<option>--just-print</option>"
msgstr "<option>--just-print</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:397
+#: apt-cdrom.8.xml:144 apt-get.8.xml:408
msgid "<option>--recon</option>"
msgstr "<option>--recon</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:398
+#: apt-cdrom.8.xml:145 apt-get.8.xml:409
msgid "<option>--no-act</option>"
msgstr "<option>--no-act</option>"
@@ -2041,7 +2049,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Sólo muestra el contenido del espacio de configuración."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
#: apt-sortpkgs.1.xml:73
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2120,7 +2128,7 @@ msgstr ""
"<filename>paquete.config.XXXX</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
+#: apt-extracttemplates.1.xml:63 apt-get.8.xml:530
msgid "<option>-t</option>"
msgstr "<option>-t</option>"
@@ -2397,7 +2405,7 @@ msgstr ""
"configuración necesaria."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:287
+#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
msgid "clean"
msgstr "clean"
@@ -2971,8 +2979,8 @@ msgstr ""
"distribución, generalmente es similar a <literal>main contrib non-free</"
"literal>."
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
msgid "Architectures"
msgstr "Arquitecturas"
@@ -3214,10 +3222,10 @@ msgid ""
"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
"replaceable>::<replaceable>Checksum</replaceable></literal> where "
-"<literal>Index</literal> can be <literal>Packages</literal>, "
-"<literal>Sources</literal> or <literal>Release</literal> and "
-"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
-"literal> or <literal>SHA256</literal>."
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
msgstr ""
"Los valores para los campos de metadatos adicionales en el fichero «Release» "
"se toman de las variables correspondientes en <literal>APT::FTPArchive::"
@@ -3229,12 +3237,12 @@ msgstr ""
"<literal>Components</literal> y <literal>Description</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:539
+#: apt-ftparchive.1.xml:540
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3243,7 +3251,7 @@ msgstr ""
"«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:547
+#: apt-ftparchive.1.xml:548
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3257,12 +3265,12 @@ msgstr ""
"configuración. Opción de configuración: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:556
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3275,12 +3283,12 @@ msgstr ""
"Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3297,12 +3305,12 @@ msgstr ""
"Contents</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:571
+#: apt-ftparchive.1.xml:572
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3313,12 +3321,12 @@ msgstr ""
"FTPArchive::SourceOverride</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:578
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:580
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3327,12 +3335,12 @@ msgstr ""
"Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:584
msgid "<option>--arch</option>"
msgstr "<option>--arch</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:585
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3346,12 +3354,12 @@ msgstr ""
"FTPArchive::Architecture</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:590
+#: apt-ftparchive.1.xml:591
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3375,12 +3383,12 @@ msgstr ""
"comprobaciones adicionales son innecesarias."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:602
+#: apt-ftparchive.1.xml:603
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:605
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3396,19 +3404,19 @@ msgstr ""
"con la orden «generate»."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
-#: sources.list.5.xml:198
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
msgid "Examples"
msgstr "Ejemplos"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:618
+#: apt-ftparchive.1.xml:619
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3417,7 +3425,7 @@ msgstr ""
"paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:632
+#: apt-ftparchive.1.xml:633
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3448,15 +3456,45 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-get.8.xml:39
+#, fuzzy
+#| msgid ""
+#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
+#| "<arg> <option>-t=</option> <arg choice='plain'> "
+#| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+#| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+#| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
+#| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#| "<group choice='req'> <arg choice='plain'> "
+#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#| "help</arg> </group> </arg> </group>"
msgid ""
"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <group choice=\"req\"> <arg "
-"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
-"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
-"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
+"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
+"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
+"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
+"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
+"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
@@ -3505,7 +3543,7 @@ msgstr ""
"</group> </arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:115
+#: apt-get.8.xml:122
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
@@ -3519,12 +3557,12 @@ msgstr ""
"&synaptic; y &wajig;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:124 apt-key.8.xml:127
+#: apt-get.8.xml:131 apt-key.8.xml:127
msgid "update"
msgstr "update"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:132
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources. The indexes of available packages are fetched from the "
@@ -3548,12 +3586,12 @@ msgstr ""
"tamaño de los archivos de paquete."
#. type: <tag></tag>
-#: apt-get.8.xml:136 guide.sgml:121
+#: apt-get.8.xml:143 guide.sgml:121
msgid "upgrade"
msgstr "upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:137
+#: apt-get.8.xml:144
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -3578,12 +3616,12 @@ msgstr ""
"hay nuevas versiones disponibles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:149
+#: apt-get.8.xml:156
msgid "dselect-upgrade"
msgstr "dselect-upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:150
+#: apt-get.8.xml:157
msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3600,12 +3638,12 @@ msgstr ""
"paquetes antiguos e instalar las nuevas versiones)."
#. type: <tag></tag>
-#: apt-get.8.xml:159 guide.sgml:140
+#: apt-get.8.xml:166 guide.sgml:140
msgid "dist-upgrade"
msgstr "dist-upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:167
msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3628,12 +3666,12 @@ msgstr ""
"comportamiento para paquetes individuales."
#. type: <tag></tag>
-#: apt-get.8.xml:172 guide.sgml:131
+#: apt-get.8.xml:179 guide.sgml:131
msgid "install"
msgstr "install"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:181
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
@@ -3661,7 +3699,7 @@ msgstr ""
"conflictos de apt-get."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:199
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -3679,7 +3717,7 @@ msgstr ""
"(stable, testing, unstable)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:206
msgid ""
"Both of the version selection mechanisms can downgrade packages and must be "
"used with care."
@@ -3688,7 +3726,7 @@ msgstr ""
"anterior de los paquetes y se debe usar con cuidado."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:202
+#: apt-get.8.xml:209
msgid ""
"This is also the target to use if you want to upgrade one or more already-"
"installed packages without upgrading every package you have on your system. "
@@ -3708,7 +3746,7 @@ msgstr ""
"instalarán."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:220
msgid ""
"Finally, the &apt-preferences; mechanism allows you to create an alternative "
"installation policy for individual packages."
@@ -3717,7 +3755,7 @@ msgstr ""
"paquetes individuales."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:224
msgid ""
"If no package matches the given expression and the expression contains one "
"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3737,12 +3775,12 @@ msgstr ""
"«$», o bien crear una expresión regular más específica."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:233
msgid "remove"
msgstr "remove"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:227
+#: apt-get.8.xml:234
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note the removing a package "
@@ -3758,12 +3796,12 @@ msgstr ""
"cuestión será instalado en vez de eliminado."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:241
msgid "purge"
msgstr "purge"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:235
+#: apt-get.8.xml:242
msgid ""
"<literal>purge</literal> is identical to <literal>remove</literal> except "
"that packages are removed and purged (any configuration files are deleted "
@@ -3774,12 +3812,12 @@ msgstr ""
"también cualquier fichero de configuración)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:246
msgid "source"
msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:240
+#: apt-get.8.xml:247
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -3798,7 +3836,7 @@ msgstr ""
"release</literal>, si es posible."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:248
+#: apt-get.8.xml:255
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
"src</literal> type lines in the &sources-list; file. This means that you "
@@ -3814,12 +3852,19 @@ msgstr ""
"instalada o de la que podría instalar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:262
+#, fuzzy
+#| msgid ""
+#| "If the <option>--compile</option> option is specified then the package "
+#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+#| "command>, if <option>--download-only</option> is specified then the "
+#| "source package will not be unpacked."
msgid ""
"If the <option>--compile</option> option is specified then the package will "
-"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
-"<option>--download-only</option> is specified then the source package will "
-"not be unpacked."
+"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+"the architecture as defined by the <command>--host-architecture</command> "
+"option. If <option>--download-only</option> is specified then the source "
+"package will not be unpacked."
msgstr ""
"Si se especifica la opción <option>--compile</option> el paquete se "
"compilará en un binario «.deb» usando <command>dpkg-buildpackage</command>, "
@@ -3827,7 +3872,7 @@ msgstr ""
"desempaquetará."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:260
+#: apt-get.8.xml:269
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -3842,7 +3887,7 @@ msgstr ""
"activando implícitamente la opción <literal>APT::Get::Only-Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:275
msgid ""
"Note that source packages are not tracked like binary packages, they exist "
"only in the current directory and are similar to downloading source tar "
@@ -3853,27 +3898,34 @@ msgstr ""
"tar comprimidos con las fuentes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:280
msgid "build-dep"
msgstr "build-dep"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:281
+#, fuzzy
+#| msgid ""
+#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+#| "an attempt to satisfy the build dependencies for a source package."
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
-"attempt to satisfy the build dependencies for a source package."
+"attempt to satisfy the build dependencies for a source package. By default "
+"the dependencies are satisfied to build the package nativly. If desired a "
+"host-architecture can be specified with the <option>--host-architecture</"
+"option> option instead."
msgstr ""
"<literal>build-dep</literal> hace que apt-get instale/desinstale paquetes en "
"un intento de satisfacer las dependencias de compilación de un paquete "
"fuente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:276
+#: apt-get.8.xml:287
msgid "check"
msgstr "check"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:288
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
@@ -3882,19 +3934,19 @@ msgstr ""
"caché de paquetes y revisa la existencia de dependencias rotas."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:292
msgid "download"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:293
msgid ""
"<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:299
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -3913,12 +3965,12 @@ msgstr ""
"literal> de vez en cuando para liberar algo de espacio en disco."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid "autoclean"
msgstr "autoclean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:298
+#: apt-get.8.xml:309
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -3937,28 +3989,33 @@ msgstr ""
"desactivada impedirá que se borren los paquetes instalados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:307
+#: apt-get.8.xml:318
msgid "autoremove"
msgstr "autoremove"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:319
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for some package and that "
+#| "are no more needed."
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for some package and that "
-"are no more needed."
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
msgstr ""
"<literal>autoremove</literal> se usa para desinstalar paquetes que se "
"instalaron automáticamente para satisfacer las dependencias de algún "
"paquete, pero que ya no son necesarios."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:323
msgid "changelog"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:324
msgid ""
"<literal>changelog</literal> downloads a package changelog and displays it "
"through <command>sensible-pager</command>. The server name and base "
@@ -3971,12 +4028,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:335
+#: apt-get.8.xml:346
msgid "<option>--no-install-recommends</option>"
msgstr "<option>--no-install-recommends</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:336
+#: apt-get.8.xml:347
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3985,14 +4042,14 @@ msgstr ""
"de configuración: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:340
+#: apt-get.8.xml:351
#, fuzzy
#| msgid "<option>--no-suggests</option>"
msgid "<option>--install-suggests</option>"
msgstr "<option>--no-suggests</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:341
+#: apt-get.8.xml:352
#, fuzzy
#| msgid ""
#| "Do not consider recommended packages as a dependency for installing. "
@@ -4005,12 +4062,12 @@ msgstr ""
"de configuración: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:356
msgid "<option>--download-only</option>"
msgstr "<option>--download-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:357
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -4019,12 +4076,12 @@ msgstr ""
"instala. Opción de configuración: <literal>APT::Get::Download-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:350
+#: apt-get.8.xml:361
msgid "<option>--fix-broken</option>"
msgstr "<option>--fix-broken</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:362
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -4052,17 +4109,17 @@ msgstr ""
"<literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:375
msgid "<option>--ignore-missing</option>"
msgstr "<option>--ignore-missing</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:365
+#: apt-get.8.xml:376
msgid "<option>--fix-missing</option>"
msgstr "<option>--fix-missing</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:366
+#: apt-get.8.xml:377
msgid ""
"Ignore missing packages; If packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -4082,12 +4139,12 @@ msgstr ""
"<literal>APT::Get::Fix-Missing</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:387
msgid "<option>--no-download</option>"
msgstr "<option>--no-download</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:388
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -4099,7 +4156,7 @@ msgstr ""
"<literal>APT::Get::Download</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:384
+#: apt-get.8.xml:395
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4120,17 +4177,17 @@ msgstr ""
"<literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:405
msgid "<option>--simulate</option>"
msgstr "<option>--simulate</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:407
msgid "<option>--dry-run</option>"
msgstr "<option>--dry-run</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:410
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -4141,7 +4198,7 @@ msgstr ""
"Simulate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:414
msgid ""
"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
"literal>) automatic. Also a notice will be displayed indicating that this "
@@ -4159,7 +4216,7 @@ msgstr ""
"avisos de <literal>apt-get</literal>)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:420
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4173,22 +4230,22 @@ msgstr ""
"problema (poco probable)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>-y</option>"
msgstr "<option>-y</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>--yes</option>"
msgstr "<option>--yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:417
+#: apt-get.8.xml:428
msgid "<option>--assume-yes</option>"
msgstr "<option>--assume-yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:418
+#: apt-get.8.xml:429
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -4204,17 +4261,37 @@ msgstr ""
"<literal>APT::Get::Assume-Yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:436
+#, fuzzy
+#| msgid "<option>--assume-yes</option>"
+msgid "<option>--assume-no</option>"
+msgstr "<option>--assume-yes</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:437
+#, fuzzy
+#| msgid ""
+#| "Compile source packages after downloading them. Configuration Item: "
+#| "<literal>APT::Get::Compile</literal>."
+msgid ""
+"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+"Descarga los paquetes fuente y luego los compila. Opción de configuración: "
+"<literal>APT::Get::Compile</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:441
msgid "<option>-u</option>"
msgstr "<option>-u</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:441
msgid "<option>--show-upgraded</option>"
msgstr "<option>--show-upgraded</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:442
msgid ""
"Show upgraded packages; Print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4223,17 +4300,17 @@ msgstr ""
"<literal>APT::Get::Show-Upgraded</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>-V</option>"
msgstr "<option>-V</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>--verbose-versions</option>"
msgstr "<option>--verbose-versions</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:448
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -4242,22 +4319,40 @@ msgstr ""
"Opción de configuración: <literal>APT::Get::Show-Versions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:453
+#, fuzzy
+#| msgid "<option>--recurse</option>"
+msgid "<option>--host-architecture</option>"
+msgstr "<option>--recurse</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:454
+msgid ""
+"This option controls the architecture packages are built for by <command>apt-"
+"get source --compile</command> and how cross-builddependencies are "
+"satisfied. By default is not set which means that the host architecture is "
+"the same as the build architecture (which is defined by <literal>APT::"
+"Architecture</literal>) Configuration Item: <literal>APT::Get::Host-"
+"Architecture</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:462
msgid "<option>-b</option>"
msgstr "<option>-b</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:462
msgid "<option>--compile</option>"
msgstr "<option>--compile</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:463
msgid "<option>--build</option>"
msgstr "<option>--build</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:464
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -4266,12 +4361,12 @@ msgstr ""
"<literal>APT::Get::Compile</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:468
msgid "<option>--ignore-hold</option>"
msgstr "<option>--ignore-hold</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:469
msgid ""
"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -4285,12 +4380,12 @@ msgstr ""
"Ignore-Hold</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:475
msgid "<option>--no-upgrade</option>"
msgstr "<option>--no-upgrade</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:450
+#: apt-get.8.xml:476
msgid ""
"Do not upgrade packages; When used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4303,12 +4398,12 @@ msgstr ""
"<literal>APT::Get::Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:482
msgid "<option>--only-upgrade</option>"
msgstr "<option>--only-upgrade</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:483
msgid ""
"Do not install new packages; When used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -4321,12 +4416,12 @@ msgstr ""
"de configuración: <literal>APT::Get::Only-Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:489
msgid "<option>--force-yes</option>"
msgstr "<option>--force-yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:490
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -4342,12 +4437,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:497
msgid "<option>--print-uris</option>"
msgstr "<option>--print-uris</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:498
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -4369,12 +4464,12 @@ msgstr ""
"<literal>APT::Get::Print-URIs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:508
msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:509
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4388,12 +4483,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:516
msgid "<option>--reinstall</option>"
msgstr "<option>--reinstall</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:517
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4403,12 +4498,12 @@ msgstr ""
"ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:495
+#: apt-get.8.xml:521
msgid "<option>--list-cleanup</option>"
msgstr "<option>--list-cleanup</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:522
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -4426,17 +4521,17 @@ msgstr ""
"<literal>APT::Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:505
+#: apt-get.8.xml:531
msgid "<option>--target-release</option>"
msgstr "<option>--target-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:532
msgid "<option>--default-release</option>"
msgstr "<option>--default-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:533
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -4460,12 +4555,12 @@ msgstr ""
"también la página del manual de &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:546
msgid "<option>--trivial-only</option>"
msgstr "<option>--trivial-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:522
+#: apt-get.8.xml:548
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4479,12 +4574,12 @@ msgstr ""
"<literal>APT::Get::Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:554
msgid "<option>--no-remove</option>"
msgstr "<option>--no-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:555
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4493,12 +4588,12 @@ msgstr ""
"preguntar. Opción de configuración: <literal>APT::Get::Remove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:534
+#: apt-get.8.xml:560
msgid "<option>--auto-remove</option>"
msgstr "<option>--auto-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:561
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4511,12 +4606,12 @@ msgstr ""
"configuración: <literal>APT::Get::AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:567
msgid "<option>--only-source</option>"
msgstr "<option>--only-source</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:568
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -4536,22 +4631,22 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--diff-only</option>"
msgstr "<option>--diff-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--dsc-only</option>"
msgstr "<option>--dsc-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--tar-only</option>"
msgstr "<option>--tar-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:553
+#: apt-get.8.xml:579
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4562,12 +4657,12 @@ msgstr ""
"Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:558
+#: apt-get.8.xml:584
msgid "<option>--arch-only</option>"
msgstr "<option>--arch-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:585
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -4576,12 +4671,12 @@ msgstr ""
"arquitectura. Opción de configuración: <literal>APT::Get::Arch-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:589
msgid "<option>--allow-unauthenticated</option>"
msgstr "<option>--allow-unauthenticated</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:564
+#: apt-get.8.xml:590
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -4592,7 +4687,7 @@ msgstr ""
"configuración: <literal>APT::Get::AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:603
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
@@ -4601,7 +4696,7 @@ msgstr ""
"&file-statelists;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:612
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4612,7 +4707,7 @@ msgstr ""
"preferences;, el Cómo de APT."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:618
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -4621,22 +4716,22 @@ msgstr ""
"100 en caso de error."
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:595
+#: apt-get.8.xml:621
msgid "ORIGINAL AUTHORS"
msgstr "AUTORES ORIGINALES"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:596
+#: apt-get.8.xml:622
msgid "&apt-author.jgunthorpe;"
msgstr "&apt-author.jgunthorpe;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:599
+#: apt-get.8.xml:625
msgid "CURRENT AUTHORS"
msgstr "AUTORES ACTUALES"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:601
+#: apt-get.8.xml:627
msgid "&apt-author.team;"
msgstr "&apt-author.team;"
@@ -4765,14 +4860,33 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:131
msgid ""
-"Update the local keyring with the keyring of Debian archive keys and removes "
-"from the keyring the archive keys which are no longer valid."
+"Update the local keyring with the archive keyring and remove from the local "
+"keyring the archive keys which are no longer valid. The archive keyring is "
+"shipped in the <literal>archive-keyring</literal> package of your "
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:141
+#, fuzzy
+#| msgid "update"
+msgid "net-update"
+msgstr "update"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:145
+msgid ""
+"Work similar to the <command>update</command> command above, but get the "
+"archive keyring from an URI instead and validate it against a master key. "
+"This requires an installed &wget; and an APT build configured to have a "
+"server to fetch from and a master keyring to validate. APT in Debian does "
+"not support this command and relies on <command>update</command> instead, "
+"but Ubuntu's APT does."
msgstr ""
-"Actualiza el registro de claves local con el registro de claves del archivo "
-"Debian, y elimina del registro las claves del archivo que ya no son válidas."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:162
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
@@ -4781,12 +4895,12 @@ msgstr ""
"descritas en el sección anterior."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:164
msgid "--keyring <replaceable>filename</replaceable>"
msgstr "--keyring <replaceable>nombre-de-fichero</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:165
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -4803,53 +4917,66 @@ msgstr ""
"esto es, por ejemplo, que las claves nuevas se añaden a este fichero."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:178
msgid "&file-trustedgpg;"
msgstr "&file-trustedgpg;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:180
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:181
msgid "Local trust database of archive keys."
msgstr "Base de datos local de las claves de confianza de archivos Debian"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#: apt-key.8.xml:184
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
-msgid "Keyring of Debian archive trusted keys."
+#: apt-key.8.xml:185
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Registro de las claves de confianza del archivo de Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:188
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
-msgid "Keyring of Debian archive removed trusted keys."
+#: apt-key.8.xml:189
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Registro de las claves de confianza eliminadas del archivo de Debian."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:198
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
+#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+#| "August 2009</date>"
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
msgstr ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 de "
"Agosto de 2009</date>"
@@ -4866,13 +4993,22 @@ msgstr "Marca o desmarca un paquete como instalado automáticamente"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:39
+#, fuzzy
+#| msgid ""
+#| " <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
+#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
msgstr ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>nombre-de-fichero</replaceable></option></arg> <group choice="
@@ -4882,7 +5018,7 @@ msgstr ""
"arg> <arg choice=\"plain\">showauto</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
@@ -4891,7 +5027,7 @@ msgstr ""
"o no."
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4907,14 +5043,21 @@ msgstr ""
"eliminará."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+#, fuzzy
+#| msgid "markauto"
+msgid "auto"
msgstr "markauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
+#, fuzzy
+#| msgid ""
+#| "<literal>markauto</literal> is used to mark a package as being "
+#| "automatically installed, which will cause the package to be removed when "
+#| "no more manually installed packages depend on this package."
msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
@@ -4923,14 +5066,19 @@ msgstr ""
"paquete instalado manualmente dependa de este paquete."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
-msgstr "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
+msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
+#, fuzzy
+#| msgid ""
+#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
@@ -4939,21 +5087,95 @@ msgstr ""
"ningún otro depende de él."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
+#: apt-mark.8.xml:85
+msgid "hold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:86
+msgid ""
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed. The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:96
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>showauto</literal> se usa para mostrar una lista de paquetes "
+"instalados automáticamente, un paquete por línea."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:101
msgid "showauto"
msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"installed packages with each package on a new line. All automatically "
+"installed packages will be listed if no package is given. If packages are "
+"given only those which are automatically installed will be shown."
msgstr ""
"<literal>showauto</literal> se usa para mostrar una lista de paquetes "
"instalados automáticamente, un paquete por línea."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:109
+#, fuzzy
+#| msgid "showauto"
+msgid "showmanual"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:116
+#, fuzzy
+#| msgid "showauto"
+msgid "showhold"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:117
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showauto</literal> se usa para mostrar una lista de paquetes "
+"instalados automáticamente, un paquete por línea."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:130
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
@@ -4961,7 +5183,7 @@ msgstr ""
"filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:131
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -4970,7 +5192,7 @@ msgstr ""
"filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:134
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -4983,48 +5205,18 @@ msgstr ""
"en el directorio definido en la opción de configuración: <literal>Dir::"
"State</literal>."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
-msgstr "<option>-h</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
-msgstr "<option>--help</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
-msgstr "Muestra un breve resumen de uso."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
-msgstr "<option>-v</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
-msgstr "<option>--version</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
-msgstr "Muestra la versión del programa."
-
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
msgid " &file-extended_states;"
msgstr " &file-extended_states;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-get;,&aptitude;,&apt-conf;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -5497,11 +5689,12 @@ msgstr ""
#| "period (.) characters - otherwise they will be silently ignored."
msgid ""
"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
-"order which have no or \"<literal>conf</literal>\" as filename extension and "
-"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
-"characters. Otherwise APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters. Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
msgstr ""
"Todos los ficheros en <literal>Dir::Etc::Parts</literal> en orden "
"alfanumérico ascendente que no tienen extensión o la extensión "
@@ -5758,13 +5951,24 @@ msgstr ""
"ficheros y analizar las listas de paquetes. El valor predeterminado es la "
"arquitectura para la que apt se compiló."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:158
+msgid ""
+"All Architectures the system supports. Processors implementing the "
+"<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
+"<literal>i386</literal>; This list is use when fetching files and parsing "
+"package lists. The internal default is always the native architecture "
+"(<literal>APT::Architecture</literal>) and all foreign architectures it can "
+"retrieve by calling <command>dpkg --print-foreign-architectures</command>."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:165
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:166
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5778,12 +5982,12 @@ msgstr ""
"«5.0*». Vea también &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:171
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:164
+#: apt.conf.5.xml:172
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -5792,12 +5996,12 @@ msgstr ""
"problemas ignore los paquetes retenidos en la toma de decisiones."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:176
msgid "Clean-Installed"
msgstr "Clean-Installed"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:177
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -5811,12 +6015,12 @@ msgstr ""
"mecanismo directo para reinstalarlos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:175
+#: apt.conf.5.xml:183
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:176
+#: apt.conf.5.xml:184
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -5880,12 +6084,12 @@ msgstr ""
"actualización."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:198
+#: apt.conf.5.xml:206
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:207
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -5902,12 +6106,12 @@ msgstr ""
"libc, ni dpkg, ni bash, ni cualquier otro del que dependan estos paquetes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:215
msgid "Cache-Start, Cache-Grow and Cache-Limit"
msgstr "Cache-Start, Cache-Grow y Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
+#: apt.conf.5.xml:216
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
@@ -5944,23 +6148,23 @@ msgstr ""
"crecimiento automático del cache."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:223
+#: apt.conf.5.xml:231
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:232
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
"Define qué paquete(s) se consideran dependencias de creación esenciales."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:235
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:236
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -5969,12 +6173,12 @@ msgstr ""
"documentación para más información sobre esta opción."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:240
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:241
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -5983,12 +6187,12 @@ msgstr ""
"la documentación para más información sobre esta opción."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:245
msgid "CDROM"
msgstr "CDROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:238
+#: apt.conf.5.xml:246
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -5997,17 +6201,17 @@ msgstr ""
"la documentación para más información sobre esta opción."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:244
+#: apt.conf.5.xml:252
msgid "The Acquire Group"
msgstr "El grupo Acquire"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:249
+#: apt.conf.5.xml:257
msgid "Check-Valid-Until"
msgstr "Check-Valid-Until"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:250
+#: apt.conf.5.xml:258
msgid ""
"Security related option defaulting to true as an expiring validation for a "
"Release file prevents longtime replay attacks and can e.g. also help users "
@@ -6027,22 +6231,70 @@ msgstr ""
"<literal>Max-ValidTime</literal>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:260
+#: apt.conf.5.xml:268
msgid "Max-ValidTime"
msgstr "Max-ValidTime"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:261
-msgid ""
-"Seconds the Release file should be considered valid after it was created. "
-"The default is \"for ever\" (0) if the Release file of the archive doesn't "
-"include a <literal>Valid-Until</literal> header. If it does then this date "
-"is the default. The date from the Release file or the date specified by the "
-"creation time of the Release file (<literal>Date</literal> header) plus the "
-"seconds specified with this options are used to check if the validation of a "
-"file has expired by using the earlier date of the two. Archive specific "
-"settings can be made by appending the label of the archive to the option "
-"name."
+#: apt.conf.5.xml:269
+#, fuzzy
+#| msgid ""
+#| "Seconds the Release file should be considered valid after it was created. "
+#| "The default is \"for ever\" (0) if the Release file of the archive "
+#| "doesn't include a <literal>Valid-Until</literal> header. If it does then "
+#| "this date is the default. The date from the Release file or the date "
+#| "specified by the creation time of the Release file (<literal>Date</"
+#| "literal> header) plus the seconds specified with this options are used to "
+#| "check if the validation of a file has expired by using the earlier date "
+#| "of the two. Archive specific settings can be made by appending the label "
+#| "of the archive to the option name."
+msgid ""
+"Seconds the Release file should be considered valid after it was created "
+"(indicated by the <literal>Date</literal> header). If the Release file "
+"itself includes a <literal>Valid-Until</literal> header the earlier date of "
+"the two is used as the expiration date. The default value is <literal>0</"
+"literal> which stands for \"for ever\". Archive specific settings can be "
+"made by appending the label of the archive to the option name."
+msgstr ""
+"Los segundos que el fichero «Release» se considerará válido después de su "
+"creación. El valor predeterminado es «para siempre» (cero) si el fichero "
+"«Release» del archivo no incluye una cabecera <literal>Valid-Until</"
+"literal>. Si lo incluye, el valor predeterminado es esta fecha. La fecha del "
+"fichero «Release» o la fecha definida por la hora de creación del fichero "
+"«Release» (cabecera <literal>Date</literal>), a lo que se añaden los "
+"segundos definidos con estas opciones, se usan para comprobar si la validez "
+"de un fichero a expirado, usando la fecha más antigua de las dos "
+"anteriormente mencionadas. Se pueden definir opciones de configuración "
+"específicas al archivo añadiendo la etiqueta del archivo al nombre de la "
+"opción."
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:279
+#, fuzzy
+#| msgid "Max-ValidTime"
+msgid "Min-ValidTime"
+msgstr "Max-ValidTime"
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
+#, fuzzy
+#| msgid ""
+#| "Seconds the Release file should be considered valid after it was created. "
+#| "The default is \"for ever\" (0) if the Release file of the archive "
+#| "doesn't include a <literal>Valid-Until</literal> header. If it does then "
+#| "this date is the default. The date from the Release file or the date "
+#| "specified by the creation time of the Release file (<literal>Date</"
+#| "literal> header) plus the seconds specified with this options are used to "
+#| "check if the validation of a file has expired by using the earlier date "
+#| "of the two. Archive specific settings can be made by appending the label "
+#| "of the archive to the option name."
+msgid ""
+"Minimum of seconds the Release file should be considered valid after it was "
+"created (indicated by the <literal>Date</literal> header). Use this if you "
+"need to use a seldomly updated (local) mirror of a more regular updated "
+"archive with a <literal>Valid-Until</literal> header instead of competely "
+"disabling the expiration date checking. Archive specific settings can and "
+"should be used by appending the label of the archive to the option name."
msgstr ""
"Los segundos que el fichero «Release» se considerará válido después de su "
"creación. El valor predeterminado es «para siempre» (cero) si el fichero "
@@ -6057,12 +6309,12 @@ msgstr ""
"opción."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:290
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:274
+#: apt.conf.5.xml:291
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6072,12 +6324,20 @@ msgstr ""
"predeterminada"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:294
+#, fuzzy
+#| msgid ""
+#| "Two sub-options to limit the use of PDiffs are also available: With "
+#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
+#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+#| "other hand is the maximum percentage of the size of all patches compared "
+#| "to the size of the targeted file. If one of these limits is exceeded the "
+#| "complete file is downloaded instead of the patches."
msgid ""
"Two sub-options to limit the use of PDiffs are also available: With "
"<literal>FileLimit</literal> can be specified how many PDiff files are "
"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum precentage of the size of all patches compared to "
+"other hand is the maximum percentage of the size of all patches compared to "
"the size of the targeted file. If one of these limits is exceeded the "
"complete file is downloaded instead of the patches."
msgstr ""
@@ -6089,12 +6349,12 @@ msgstr ""
"estos límites, se descargará el fichero completo en lugar de los parches."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:303
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:304
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6109,12 +6369,12 @@ msgstr ""
"se abrirá una conexión por cada tipo de URI."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:311
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#: apt.conf.5.xml:312
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6123,12 +6383,12 @@ msgstr ""
"intentar obtener los ficheros fallidos el número de veces proporcionado."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:299
+#: apt.conf.5.xml:316
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:300
+#: apt.conf.5.xml:317
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6138,12 +6398,12 @@ msgstr ""
"forma predeterminada."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304 sources.list.5.xml:144
+#: apt.conf.5.xml:321 sources.list.5.xml:160
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:322
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6161,7 +6421,7 @@ msgstr ""
"definir ninguna de las opciones anteriores."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#: apt.conf.5.xml:330
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6186,7 +6446,7 @@ msgstr ""
"grandes. Aviso: Squid 2.0.2 no permite usar ninguna de estas opciones."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323 apt.conf.5.xml:387
+#: apt.conf.5.xml:340 apt.conf.5.xml:404
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6197,7 +6457,7 @@ msgstr ""
"realizar la conexión y para recibir datos."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:343
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -6216,7 +6476,7 @@ msgstr ""
"necesitan esto violan la RFC 2068."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:351
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6231,7 +6491,7 @@ msgstr ""
"implícitamente la descarga simultánea desde varios servidores)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:339
+#: apt.conf.5.xml:356
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -6242,12 +6502,12 @@ msgstr ""
"permiten el acceso para clientes que usan un identificador conocido."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:362
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:363
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -6262,7 +6522,7 @@ msgstr ""
"opción <literal>Pipeline-Depth</literal> no se puede usar por ahora."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:352
+#: apt.conf.5.xml:369
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6299,12 +6559,12 @@ msgstr ""
"corresponde a la opción por máquina."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:370 sources.list.5.xml:155
+#: apt.conf.5.xml:387 sources.list.5.xml:171
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:388
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6338,7 +6598,7 @@ msgstr ""
"URI."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:407
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -6354,7 +6614,7 @@ msgstr ""
"fichero de configuración de muestra para ver algunos ejemplos)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:414
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6368,7 +6628,7 @@ msgstr ""
"de http debido a su poca eficiencia."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:419
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6384,18 +6644,18 @@ msgstr ""
"compatibles con la RFC 2428."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:409 sources.list.5.xml:137
+#: apt.conf.5.xml:426 sources.list.5.xml:153
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:415
+#: apt.conf.5.xml:432
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"algo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#: apt.conf.5.xml:427
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6417,12 +6677,12 @@ msgstr ""
"para desmontar usando UMount."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:437
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:421
+#: apt.conf.5.xml:438
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6433,18 +6693,18 @@ msgstr ""
"introducidos a gpgv."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:443
msgid "CompressionTypes"
msgstr "CompressionTypes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:449
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr "Acquire::CompressionTypes::<replaceable>extensión-del-fichero</replaceable> \"<replaceable>nombre-del-método</replaceable>\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:427
+#: apt.conf.5.xml:444
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6464,19 +6724,19 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:454
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:457
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:433
+#: apt.conf.5.xml:450
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6507,13 +6767,13 @@ msgstr ""
"lista ya que se añadirá de forma automática."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:461
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:442
+#: apt.conf.5.xml:459
#, fuzzy
#| msgid ""
#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
@@ -6530,9 +6790,9 @@ msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
"will only be used if this file exists, e.g. for the bzip2 method (the "
-"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
-"that list entries specified on the command line will be added at the end of "
-"the list specified in the configuration files, but before the default "
+"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+"also that list entries specified on the command line 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 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 "
@@ -6551,20 +6811,20 @@ msgstr ""
"lista definida, sólo añadirá este tipo al principio de la lista."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:466
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
"uncompressed files so this is mostly only useable for local mirrors."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:454
+#: apt.conf.5.xml:471
msgid "GzipIndexes"
msgstr "GzipIndexes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:473
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -6578,12 +6838,12 @@ msgstr ""
"paquetes locales. El valor predeterminado es «false»."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:463
+#: apt.conf.5.xml:480
msgid "Languages"
msgstr "Languages"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:481
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
@@ -6604,13 +6864,13 @@ msgstr ""
"informarse de cuales están disponibles antes de definir valores imposibles."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:480
+#: apt.conf.5.xml:497
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; }"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:487
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -6652,7 +6912,7 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:253
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6661,12 +6921,12 @@ msgstr ""
"paquetes y los gestores de URI. <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:487
+#: apt.conf.5.xml:504
msgid "Directories"
msgstr "Directorios"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:506
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6686,7 +6946,7 @@ msgstr ""
"empiecen con <filename>/</filename> ó <filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:513
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6708,7 +6968,7 @@ msgstr ""
"predeterminado está en <literal>Dir::Cache</literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:522
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6724,7 +6984,7 @@ msgstr ""
"<envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:528
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -6735,7 +6995,7 @@ msgstr ""
"Al finalizar este proceso carga el fichero de configuración principal."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:532
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6752,7 +7012,7 @@ msgstr ""
"literal> especifican la ubicación de sus respectivos programas."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:540
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6773,7 +7033,7 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:553
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -6791,12 +7051,12 @@ msgstr ""
"de expresiones regulares."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:562
msgid "APT in DSelect"
msgstr "APT con DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:564
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6807,12 +7067,12 @@ msgstr ""
"encuentran en la sección <literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:551
+#: apt.conf.5.xml:568
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:569
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6830,7 +7090,7 @@ msgstr ""
"descargar los paquetes nuevos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:578
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6839,12 +7099,12 @@ msgstr ""
"la línea de ordenes al ejecutar la fase de instalación."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:582
msgid "Updateoptions"
msgstr "Updateoptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:583
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6853,12 +7113,12 @@ msgstr ""
"la línea de ordenes al ejecutar la fase de actualización."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:587
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:588
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6868,12 +7128,12 @@ msgstr ""
"preguntará en caso de error."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:594
msgid "How APT calls dpkg"
msgstr "Cómo invoca APT a dpkg"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:595
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6882,7 +7142,7 @@ msgstr ""
"se encuentran en la sección <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:583
+#: apt.conf.5.xml:600
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -6893,17 +7153,17 @@ msgstr ""
"introduce a &dpkg; como un sólo argumento."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:606
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6916,12 +7176,12 @@ msgstr ""
"sh</filename>, y APT finalizará en caso de fallo."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:612
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:613
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6937,7 +7197,7 @@ msgstr ""
"instalar, uno por línea."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:619
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6953,12 +7213,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:626
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:627
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6967,12 +7227,12 @@ msgstr ""
"predeterminado es <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:631
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:615
+#: apt.conf.5.xml:632
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6982,12 +7242,12 @@ msgstr ""
"paquetes y a producir todos los binarios."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:637
msgid "dpkg trigger usage (and related options)"
msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:638
#, fuzzy
#| msgid ""
#| "APT can call dpkg in a way so it can make aggressive use of triggers over "
@@ -7026,7 +7286,7 @@ msgstr ""
"mientras se están configurando todos los paquetes."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:653
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -7040,7 +7300,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:647
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -7064,12 +7324,12 @@ msgstr ""
"\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:642
+#: apt.conf.5.xml:659
msgid "DPkg::NoTriggers"
msgstr "DPkg::NoTriggers"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:660
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -7090,12 +7350,12 @@ msgstr ""
"añadirá esta opción a las llamadas de desempaquetado y borrado."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:650
+#: apt.conf.5.xml:667
msgid "PackageManager::Configure"
msgstr "PackageManager::Configure"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:668
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7124,12 +7384,12 @@ msgstr ""
"sistema. "
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:678
msgid "DPkg::ConfigurePending"
msgstr "DPkg::ConfigurePending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:662
+#: apt.conf.5.xml:679
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -7147,12 +7407,12 @@ msgstr ""
"desactivar esta opción en todas las ejecuciones menos la última."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:685
msgid "DPkg::TriggersPending"
msgstr "DPkg::TriggersPending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:669
+#: apt.conf.5.xml:686
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7168,12 +7428,12 @@ msgstr ""
"necesarios para configurar este paquete."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:691
msgid "PackageManager::UnpackAll"
msgstr "PackageManager::UnpackAll"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:675
+#: apt.conf.5.xml:692
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-"
@@ -7193,12 +7453,12 @@ msgstr ""
"ser realmente útil."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:699
msgid "OrderList::Score::Immediate"
msgstr "OrderList::Score::Immediate"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:707
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7216,7 +7476,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:700
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 "
@@ -7241,12 +7501,12 @@ msgstr ""
"\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:720
msgid "Periodic and Archives options"
msgstr "Las opciones «Periodic» y «Archives»"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:721
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7260,12 +7520,12 @@ msgstr ""
"documentación de estas opciones."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:729
msgid "Debug options"
msgstr "Opciones de depuración"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:731
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7282,7 +7542,7 @@ msgstr ""
"para un usuario normal, aunque unas cuantas sí son:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:742
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7293,7 +7553,7 @@ msgstr ""
"purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:750
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7304,7 +7564,7 @@ msgstr ""
"<literal>apt-get -s install</literal>) como un usuario normal."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:759
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7316,7 +7576,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:750
+#: apt.conf.5.xml:767
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -7325,19 +7585,19 @@ msgstr ""
"statfs en los identificadores de los CDROM."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:777
msgid "A full list of debugging options to apt follows."
msgstr ""
"A continuación, se muestra la lista completa de las opciones de depuración "
"de apt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:782
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:769
+#: apt.conf.5.xml:786
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -7345,46 +7605,46 @@ msgstr ""
"<literal>cdrom://</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:793
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:780
+#: apt.conf.5.xml:797
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Muestra la información relacionada con la descarga de paquetes mediante FTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:787
+#: apt.conf.5.xml:804
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:791
+#: apt.conf.5.xml:808
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Muestra la información relacionada con la descarga de paquetes mediante HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:815
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:802
+#: apt.conf.5.xml:819
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
"Muestra la información relacionada con la descarga de paquetes mediante "
"HTTPS."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:826
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:813
+#: apt.conf.5.xml:830
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7393,12 +7653,12 @@ msgstr ""
"criptográficas mediante <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:820
+#: apt.conf.5.xml:837
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:841
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -7407,24 +7667,24 @@ msgstr ""
"paquetes almacenadas en CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:848
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:851
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Describe el proceso de resolución de dependencias de compilación en &apt-"
"get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:858
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:861
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7433,12 +7693,12 @@ msgstr ""
"<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:868
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:871
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 "
@@ -7449,12 +7709,12 @@ msgstr ""
"identificador de un CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:879
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:882
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."
@@ -7464,24 +7724,24 @@ msgstr ""
"a la vez."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:873
+#: apt.conf.5.xml:890
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:894
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Registra los elementos que se añaden o se borran de la cola de descarga "
"global."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:884
+#: apt.conf.5.xml:901
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:887
+#: apt.conf.5.xml:904
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7491,12 +7751,12 @@ msgstr ""
"ficheros descargados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:894
+#: apt.conf.5.xml:911
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:897
+#: apt.conf.5.xml:914
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7505,12 +7765,12 @@ msgstr ""
"lista de índices de paquetes, y los errores relacionados con éstos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:905
+#: apt.conf.5.xml:922
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:909
+#: apt.conf.5.xml:926
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7520,12 +7780,12 @@ msgstr ""
"índices completos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:916
+#: apt.conf.5.xml:933
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:920
+#: apt.conf.5.xml:937
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -7533,12 +7793,12 @@ msgstr ""
"descargas."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:927
+#: apt.conf.5.xml:944
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:948
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7547,12 +7807,12 @@ msgstr ""
"de los paquetes y con la eliminación de los paquetes sin usar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:955
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:941
+#: apt.conf.5.xml:958
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7567,12 +7827,12 @@ msgstr ""
"<literal>apt</literal>. Véase <literal>Debug::pkgProblemResolver</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:969
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:955
+#: apt.conf.5.xml:972
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7602,24 +7862,24 @@ msgstr ""
"la sección en la que aparece el paquete."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:991
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:994
msgid "Dump the default configuration to standard error on startup."
msgstr ""
"Vuelca la configuración predeterminada a la salida estándar durante al "
"iniciarse."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:984
+#: apt.conf.5.xml:1001
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:987
+#: apt.conf.5.xml:1004
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7628,12 +7888,12 @@ msgstr ""
"invocó, con los argumentos separados por un espacio."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1012
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:998
+#: apt.conf.5.xml:1015
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7642,12 +7902,12 @@ msgstr ""
"estado y cualquier error encontrado durante el análisis."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1022
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1009
+#: apt.conf.5.xml:1026
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7656,12 +7916,12 @@ msgstr ""
"literal> debería entregar los paquetes a &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1034
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1021
+#: apt.conf.5.xml:1038
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -7669,22 +7929,22 @@ msgstr ""
"&dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1028
+#: apt.conf.5.xml:1045
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1032
+#: apt.conf.5.xml:1049
msgid "Output the priority of each package list on startup."
msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1055
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1042
+#: apt.conf.5.xml:1059
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7693,12 +7953,12 @@ msgstr ""
"lo que ocurre cuando se encuentra un problema de dependencias complejo)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1050
+#: apt.conf.5.xml:1067
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:1053
+#: apt.conf.5.xml:1070
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 "
@@ -7709,12 +7969,12 @@ msgstr ""
"misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1078
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1065
+#: apt.conf.5.xml:1082
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7723,7 +7983,7 @@ msgstr ""
"vendors.list</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1088
+#: apt.conf.5.xml:1105
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7732,13 +7992,13 @@ msgstr ""
"valores de ejemplo para todas las opciones posibles."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1112
msgid "&file-aptconf;"
msgstr "&file-aptconf;"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1100
+#: apt.conf.5.xml:1117
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7847,8 +8107,8 @@ msgstr ""
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
-"following naming convention: The files have no or \"<literal>pref</literal>"
-"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
"that it has ignored a file if the file doesn't match a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@ -8306,17 +8566,84 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+#, fuzzy
+#| msgid "Packages"
+msgid "Package"
+msgstr "Packages"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
msgid "How APT Interprets Priorities"
msgstr "¿Cómo interpreta APT las prioridades?"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:314
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:315
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8325,12 +8652,12 @@ msgstr ""
"el sistema."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:319
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8339,12 +8666,12 @@ msgstr ""
"que la versión instalada sea más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:325
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:326
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8354,12 +8681,12 @@ msgstr ""
"más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:288
+#: apt_preferences.5.xml:331
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:332
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8368,12 +8695,12 @@ msgstr ""
"perteneciente a otra distribución, o si la versión instalada es más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:337
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:338
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8381,17 +8708,17 @@ msgstr ""
"La versión sólo se instala si no hay ninguna versión del paquete instalada."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:342
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:343
msgid "prevents the version from being installed"
msgstr "Evita la instalación de la versión."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:309
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8402,7 +8729,7 @@ msgstr ""
"siguiente modo: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:348
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8416,7 +8743,7 @@ msgstr ""
"versión del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:354
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8425,7 +8752,7 @@ msgstr ""
"registros antes mencionados:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:358
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8453,12 +8780,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:371
msgid "Then:"
msgstr "Por ello:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:373
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8473,7 +8800,7 @@ msgstr ""
"la versión 5.8*, desactualizando el paquete."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:378
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8484,7 +8811,7 @@ msgstr ""
"versiones, incluso sobre los pertenecientes a la distribución objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:382
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8497,12 +8824,12 @@ msgstr ""
"hay ninguna versión del paquete ya instalado."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:392
msgid "Determination of Package Version and Distribution Properties"
msgstr "Determinar la versión del paquete y las propiedades de la distribución"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:394
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8513,27 +8840,27 @@ msgstr ""
"describen los paquetes disponibles en cada uno de los sitios."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:406
msgid "the <literal>Package:</literal> line"
msgstr "La línea <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:364
+#: apt_preferences.5.xml:407
msgid "gives the package name"
msgstr "indica el nombre del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
msgid "the <literal>Version:</literal> line"
msgstr "La línea <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:411
msgid "gives the version number for the named package"
msgstr "indica el número de versión del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:398
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8554,12 +8881,12 @@ msgstr ""
"de APT: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:427
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:428
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8577,18 +8904,18 @@ msgstr ""
"línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:438
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:444
msgid "the <literal>Codename:</literal> line"
msgstr "La línea <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:445
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -8607,13 +8934,13 @@ msgstr ""
"de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:454
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:461
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8629,7 +8956,7 @@ msgstr ""
"siguientes línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:470
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8641,12 +8968,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:479
msgid "the <literal>Component:</literal> line"
msgstr "La línea <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:480
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8665,18 +8992,18 @@ msgstr ""
"de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:446
+#: apt_preferences.5.xml:489
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:452
+#: apt_preferences.5.xml:495
msgid "the <literal>Origin:</literal> line"
msgstr "La línea <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:453
+#: apt_preferences.5.xml:496
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8689,18 +9016,18 @@ msgstr ""
"mediante la siguiente línea:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:459
+#: apt_preferences.5.xml:502
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:465
+#: apt_preferences.5.xml:508
msgid "the <literal>Label:</literal> line"
msgstr "La línea <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:509
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8713,13 +9040,13 @@ msgstr ""
"siguiente línea:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:515
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:416
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8742,7 +9069,7 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:522
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8767,12 +9094,12 @@ msgstr ""
"la distribución «<literal>unstable</literal>» (inestable)."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:535
msgid "Optional Lines in an APT Preferences Record"
msgstr "Líneas opcionales en el registro de preferencias de APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:494
+#: apt_preferences.5.xml:537
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8783,12 +9110,12 @@ msgstr ""
"Útil para comentarios."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:503
+#: apt_preferences.5.xml:546
msgid "Tracking Stable"
msgstr "Seguir la distribución «stable» (estable)"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:554
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8812,7 +9139,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8827,8 +9154,8 @@ msgstr ""
"<literal>Debian</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8840,7 +9167,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:566
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8854,13 +9181,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:583
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>paquete</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:577
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8873,12 +9200,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:589
msgid "Tracking Testing or Unstable"
msgstr "Seguir la distribución «testing» (en pruebas) o «unstable» (inestable)"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:555
+#: apt_preferences.5.xml:598
#, no-wrap
msgid ""
"Package: *\n"
@@ -8906,7 +9233,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:591
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8923,7 +9250,7 @@ msgstr ""
">"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:612
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8936,13 +9263,13 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:632
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>paquete</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:623
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -8961,12 +9288,12 @@ msgstr ""
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:596
+#: apt_preferences.5.xml:639
msgid "Tracking the evolution of a codename release"
msgstr "Seguir la evolución de una publicación por el nombre"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:610
+#: apt_preferences.5.xml:653
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9000,7 +9327,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:641
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9027,7 +9354,7 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:670
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9041,13 +9368,13 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:647
+#: apt_preferences.5.xml:690
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:681
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9066,12 +9393,12 @@ msgstr ""
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:699
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:662
+#: apt_preferences.5.xml:705
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -9205,8 +9532,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:81
-#, no-wrap
-msgid "deb uri distribution [component1] [component2] [...]"
+#, fuzzy, no-wrap
+#| msgid "deb uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri distribution [component1] [component2] [...]"
msgstr "deb uri distribución [componente1] [componente2] [...]"
#. type: Content of: <refentry><refsect1><para>
@@ -9277,6 +9605,38 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:112
msgid ""
+"<literal>options</literal> is always optional and needs to be surounded by "
+"square brackets. It can consist of multiple settings in the form "
+"<literal><replaceable>setting</replaceable>=<replaceable>value</"
+"replaceable></literal>. Multiple settings are separated by spaces. The "
+"following settings are supported by APT, note through that unsupported "
+"settings will be ignored silently:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:117
+msgid ""
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> can be used to specify for which architectures "
+"packages information should be downloaded. If this option is not set all "
+"architectures defined by the <literal>APT::Architectures</literal> option "
+"will be downloaded."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:128
+msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@ -9288,12 +9648,12 @@ msgstr ""
"seguidos por servidores de Internet distantes, por ejemplo)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:133
msgid "Some examples:"
msgstr "Algunos ejemplos:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:119
+#: sources.list.5.xml:135
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -9305,17 +9665,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:125
+#: sources.list.5.xml:141
msgid "URI specification"
msgstr "Especificación de la URI"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:146
msgid "file"
msgstr "file"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:132
+#: sources.list.5.xml:148
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -9326,7 +9686,7 @@ msgstr ""
"particiones montadas mediante NFS y réplicas o archivos de paquetes locales."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:155
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -9336,7 +9696,7 @@ msgstr ""
"list»."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:162
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9353,7 +9713,7 @@ msgstr ""
"Tenga en cuenta que este método de autenticación no es seguro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:173
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -9372,12 +9732,12 @@ msgstr ""
"ignorarán proxies ftp definidos en el fichero de configuración que usen http."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:182
msgid "copy"
msgstr "copy"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:184
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -9388,17 +9748,17 @@ msgstr ""
"Esto es útil para gente que use discos zip con APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "rsh"
msgstr "rsh"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "ssh"
msgstr "ssh"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:191
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -9413,12 +9773,12 @@ msgstr ""
"command> y <command>dd</command> para realizar la transferencia de ficheros."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:199
msgid "more recognizable URI types"
msgstr "Otros tipos de URI reconocidos."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:185
+#: sources.list.5.xml:201
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
@@ -9439,7 +9799,7 @@ msgstr ""
"filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:143
msgid ""
"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -9448,7 +9808,7 @@ msgstr ""
"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:215
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -9457,36 +9817,59 @@ msgstr ""
"«stable/main», «stable/contrib», y «stable/non-free»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:203
+#: sources.list.5.xml:219
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Como arriba, excepto que usa la distribución «unstable» (en desarrollo)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:220
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:222
msgid "Source line for the above"
msgstr "Línea para obtener el código fuente desde la ubicación anterior."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:223
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:209
+#: sources.list.5.xml:225
+msgid ""
+"The first line gets package information for the architectures in "
+"<literal>APT::Architectures</literal> while the second always retrieves "
+"<literal>amd64</literal> and <literal>armel</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:227
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#| " "
+msgid ""
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgstr ""
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+" "
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:230
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -9495,13 +9878,13 @@ msgstr ""
"sólo la sección «hamm/main»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:211
+#: sources.list.5.xml:232
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:234
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -9510,13 +9893,13 @@ msgstr ""
"directorio «debian», y usa sólo la sección «&stable-codename;/contrib»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:236
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:238
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -9529,20 +9912,20 @@ msgstr ""
"filename>, se usará sólo una sesión FTP para ambas."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:251
#, fuzzy, no-wrap
#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:244
#, fuzzy
#| msgid ""
#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@ -9570,7 +9953,7 @@ msgstr ""
"estructura.) <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:256
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
@@ -11095,6 +11478,35 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "Ésto usará los archivos del disco previamente obtenidos."
+#~ msgid ""
+#~ "Update the local keyring with the keyring of Debian archive keys and "
+#~ "removes from the keyring the archive keys which are no longer valid."
+#~ msgstr ""
+#~ "Actualiza el registro de claves local con el registro de claves del "
+#~ "archivo Debian, y elimina del registro las claves del archivo que ya no "
+#~ "son válidas."
+
+#~ msgid "unmarkauto"
+#~ msgstr "unmarkauto"
+
+#~ msgid "<option>-h</option>"
+#~ msgstr "<option>-h</option>"
+
+#~ msgid "<option>--help</option>"
+#~ msgstr "<option>--help</option>"
+
+#~ msgid "Show a short usage summary."
+#~ msgstr "Muestra un breve resumen de uso."
+
+#~ msgid "<option>-v</option>"
+#~ msgstr "<option>-v</option>"
+
+#~ msgid "<option>--version</option>"
+#~ msgstr "<option>--version</option>"
+
+#~ msgid "Show the program version."
+#~ msgstr "Muestra la versión del programa."
+
#~ msgid "<option>--md5</option>"
#~ msgstr "<option>--md5</option>"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index c3648fc88..b41869a7f 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2011-04-05 10:22+0300\n"
+"POT-Creation-Date: 2011-11-10 16:42+0100\n"
"PO-Revision-Date: 2011-02-17 07:50+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -730,8 +730,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
msgid "Description"
@@ -751,7 +751,7 @@ msgstr ""
"desquelles il extrait les informations intéressantes."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:120
+#: apt-cache.8.xml:70 apt-get.8.xml:127
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -1250,8 +1250,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
+#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
msgid "options"
msgstr "options"
@@ -1277,7 +1277,7 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
#: apt-sortpkgs.1.xml:61
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1304,12 +1304,12 @@ msgstr ""
"<literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1391,9 +1391,16 @@ msgstr "<option>--no-enhances</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:317
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be twicked with these flags "
+#| "which will omit the specified dependency type. Configuration Item: "
+#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be twicked with these flags which will omit "
+"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
"Cache::ShowRecommends</literal>."
@@ -1405,7 +1412,7 @@ msgstr ""
"replaceable></literal>, p. ex. <literal>APT::Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
+#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
msgid "<option>-f</option>"
msgstr "<option>-f</option>"
@@ -1425,7 +1432,8 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+#: apt-get.8.xml:452
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -1545,14 +1553,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:596
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
+#: apt-cache.8.xml:372 apt-get.8.xml:601 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt.conf.5.xml:1110 apt_preferences.5.xml:697
msgid "Files"
msgstr "Fichiers"
@@ -1563,10 +1571,10 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
-#: sources.list.5.xml:234
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:611
+#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
msgid "See Also"
msgstr "Voir aussi"
@@ -1577,8 +1585,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:617
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "Diagnostics"
@@ -1707,12 +1715,12 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:161
msgid "Options"
msgstr "Options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -1756,7 +1764,7 @@ msgstr ""
"<literal>APT::CDROM::Rename</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:364
+#: apt-cdrom.8.xml:116 apt-get.8.xml:375
msgid "<option>-m</option>"
msgstr "<option>-m</option>"
@@ -1813,17 +1821,17 @@ msgstr ""
"le CD mais tous les paquets seront repérés."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:395
+#: apt-cdrom.8.xml:143 apt-get.8.xml:406
msgid "<option>--just-print</option>"
msgstr "<option>--just-print</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:397
+#: apt-cdrom.8.xml:144 apt-get.8.xml:408
msgid "<option>--recon</option>"
msgstr "<option>--recon</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:398
+#: apt-cdrom.8.xml:145 apt-get.8.xml:409
msgid "<option>--no-act</option>"
msgstr "<option>--no-act</option>"
@@ -1969,7 +1977,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Affiche seulement le contenu de l'espace de configuration."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
#: apt-sortpkgs.1.xml:73
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2048,7 +2056,7 @@ msgstr ""
"<filename>package.config.XXXX</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
+#: apt-extracttemplates.1.xml:63 apt-get.8.xml:530
msgid "<option>-t</option>"
msgstr "<option>-t</option>"
@@ -2334,7 +2342,7 @@ msgstr ""
"préciser index et répertoires aussi bien que les paramètres requis."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:287
+#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
msgid "clean"
msgstr "clean"
@@ -2898,8 +2906,8 @@ msgstr ""
"distribution ; classiquement, on trouve <literal>main contrib non-free</"
"literal>."
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
msgid "Architectures"
msgstr "Architectures"
@@ -3142,10 +3150,10 @@ msgid ""
"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
"replaceable>::<replaceable>Checksum</replaceable></literal> where "
-"<literal>Index</literal> can be <literal>Packages</literal>, "
-"<literal>Sources</literal> or <literal>Release</literal> and "
-"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
-"literal> or <literal>SHA256</literal>."
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
msgstr ""
"La valeur des autres champs de métadonnées du fichier Release sont tirées de "
"la valeur correspondante dans <literal>APT::FTPArchive::Release</literal>, "
@@ -3157,12 +3165,12 @@ msgstr ""
"<literal>Description</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:539
+#: apt-ftparchive.1.xml:540
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3172,7 +3180,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:547
+#: apt-ftparchive.1.xml:548
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3187,12 +3195,12 @@ msgstr ""
"configuration : <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:556
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3206,12 +3214,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3227,12 +3235,12 @@ msgstr ""
"de configuration : <literal>APT::FTPArchive::Contents</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:571
+#: apt-ftparchive.1.xml:572
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3243,12 +3251,12 @@ msgstr ""
"FTPArchive::SourceOverride</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:578
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:580
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3257,12 +3265,12 @@ msgstr ""
"configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:584
msgid "<option>--arch</option>"
msgstr "<option>--arch</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:585
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3276,12 +3284,12 @@ msgstr ""
"<literal>APT::FTPArchive::Architecture</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:590
+#: apt-ftparchive.1.xml:591
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3304,12 +3312,12 @@ msgstr ""
"survenir et l'ensemble de ces contrôles devient inutile."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:602
+#: apt-ftparchive.1.xml:603
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:605
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3325,19 +3333,19 @@ msgstr ""
"generate."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
-#: sources.list.5.xml:198
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
msgid "Examples"
msgstr "Exemples"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:618
+#: apt-ftparchive.1.xml:619
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3346,7 +3354,7 @@ msgstr ""
"des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:632
+#: apt-ftparchive.1.xml:633
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3377,15 +3385,45 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-get.8.xml:39
+#, fuzzy
+#| msgid ""
+#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
+#| "<arg> <option>-t=</option> <arg choice='plain'> "
+#| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+#| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+#| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
+#| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#| "<group choice='req'> <arg choice='plain'> "
+#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#| "help</arg> </group> </arg> </group>"
msgid ""
"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <group choice=\"req\"> <arg "
-"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
-"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
-"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
+"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
+"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
+"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
+"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
+"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
@@ -3434,7 +3472,7 @@ msgstr ""
"</group> </arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:115
+#: apt-get.8.xml:122
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
@@ -3447,12 +3485,12 @@ msgstr ""
"existent, comme &dselect;, &aptitude;, &synaptic; and &wajig;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:124 apt-key.8.xml:127
+#: apt-get.8.xml:131 apt-key.8.xml:127
msgid "update"
msgstr "update"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:132
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources. The indexes of available packages are fetched from the "
@@ -3477,12 +3515,12 @@ msgstr ""
"ne peut être connue à l'avance."
#. type: <tag></tag>
-#: apt-get.8.xml:136 guide.sgml:121
+#: apt-get.8.xml:143 guide.sgml:121
msgid "upgrade"
msgstr "upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:137
+#: apt-get.8.xml:144
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -3508,12 +3546,12 @@ msgstr ""
"l'existence de nouvelles versions des paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:149
+#: apt-get.8.xml:156
msgid "dselect-upgrade"
msgstr "dselect-upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:150
+#: apt-get.8.xml:157
msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3531,12 +3569,12 @@ msgstr ""
"installation de nouveaux paquets)."
#. type: <tag></tag>
-#: apt-get.8.xml:159 guide.sgml:140
+#: apt-get.8.xml:166 guide.sgml:140
msgid "dist-upgrade"
msgstr "dist-upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:167
msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3559,12 +3597,12 @@ msgstr ""
"un mécanisme de remplacement des paramètres généraux pour certains paquets."
#. type: <tag></tag>
-#: apt-get.8.xml:172 guide.sgml:131
+#: apt-get.8.xml:179 guide.sgml:131
msgid "install"
msgstr "install"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:181
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
@@ -3592,7 +3630,7 @@ msgstr ""
"des conflits d'apt-get."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:199
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -3609,7 +3647,7 @@ msgstr ""
"unstable)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:206
msgid ""
"Both of the version selection mechanisms can downgrade packages and must be "
"used with care."
@@ -3619,7 +3657,7 @@ msgstr ""
"avec précaution."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:202
+#: apt-get.8.xml:209
msgid ""
"This is also the target to use if you want to upgrade one or more already-"
"installed packages without upgrading every package you have on your system. "
@@ -3639,7 +3677,7 @@ msgstr ""
"décrit plus haut) sera récupérée et installée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:220
msgid ""
"Finally, the &apt-preferences; mechanism allows you to create an alternative "
"installation policy for individual packages."
@@ -3648,7 +3686,7 @@ msgstr ""
"l'installation des paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:224
msgid ""
"If no package matches the given expression and the expression contains one "
"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3669,12 +3707,12 @@ msgstr ""
"d'utiliser une expression plus précise."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:233
msgid "remove"
msgstr "remove"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:227
+#: apt-get.8.xml:234
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note the removing a package "
@@ -3690,12 +3728,12 @@ msgstr ""
"d'être supprimé."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:241
msgid "purge"
msgstr "purge"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:235
+#: apt-get.8.xml:242
msgid ""
"<literal>purge</literal> is identical to <literal>remove</literal> except "
"that packages are removed and purged (any configuration files are deleted "
@@ -3706,12 +3744,12 @@ msgstr ""
"de configuration sont également effacés)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:246
msgid "source"
msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:240
+#: apt-get.8.xml:247
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -3731,7 +3769,7 @@ msgstr ""
"respect the default release\"\"\" me paraît douteux."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:248
+#: apt-get.8.xml:255
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
"src</literal> type lines in the &sources-list; file. This means that you "
@@ -3747,19 +3785,26 @@ msgstr ""
"installé ou que vous voulez installer."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:262
+#, fuzzy
+#| msgid ""
+#| "If the <option>--compile</option> option is specified then the package "
+#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+#| "command>, if <option>--download-only</option> is specified then the "
+#| "source package will not be unpacked."
msgid ""
"If the <option>--compile</option> option is specified then the package will "
-"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
-"<option>--download-only</option> is specified then the source package will "
-"not be unpacked."
+"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+"the architecture as defined by the <command>--host-architecture</command> "
+"option. If <option>--download-only</option> is specified then the source "
+"package will not be unpacked."
msgstr ""
"Si l'option <option>--compile</option> est spécifiée, le paquet est compilé "
"en un binaire .deb avec <command>dpkg-buildpackage</command>. Si <option>--"
"download-only</option> est spécifié, le source n'est pas décompacté."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:260
+#: apt-get.8.xml:269
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -3774,7 +3819,7 @@ msgstr ""
"Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:275
msgid ""
"Note that source packages are not tracked like binary packages, they exist "
"only in the current directory and are similar to downloading source tar "
@@ -3785,27 +3830,34 @@ msgstr ""
"sont semblables à des sources téléchargées sous forme d'archives tar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:280
msgid "build-dep"
msgstr "build-dep"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:281
+#, fuzzy
+#| msgid ""
+#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+#| "an attempt to satisfy the build dependencies for a source package."
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
-"attempt to satisfy the build dependencies for a source package."
+"attempt to satisfy the build dependencies for a source package. By default "
+"the dependencies are satisfied to build the package nativly. If desired a "
+"host-architecture can be specified with the <option>--host-architecture</"
+"option> option instead."
msgstr ""
"Avec la commande <literal>build-dep</literal>, apt-get installe ou supprime "
"des paquets dans le but de satisfaire les dépendances de construction d'un "
"paquet source."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:276
+#: apt-get.8.xml:287
msgid "check"
msgstr "check"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:288
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
@@ -3814,21 +3866,25 @@ msgstr ""
"jour le cache des paquets et cherche les dépendances défectueuses."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:292
msgid "download"
msgstr "download"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:293
+#, fuzzy
+#| msgid ""
+#| "<literal>download</literal> will download the given binary package into "
+#| "the current directoy."
msgid ""
"<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
msgstr ""
"<literal>download</literal> télécharge le fichier binaire indiqué dans le "
"répertoire courant."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:299
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -3847,12 +3903,12 @@ msgstr ""
"temps en temps si l'on veut libérer de l'espace disque."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid "autoclean"
msgstr "autoclean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:298
+#: apt-get.8.xml:309
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -3871,28 +3927,33 @@ msgstr ""
"installés."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:307
+#: apt-get.8.xml:318
msgid "autoremove"
msgstr "autoremove"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:319
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for some package and that "
+#| "are no more needed."
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for some package and that "
-"are no more needed."
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
msgstr ""
"Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets "
"installés dans le but de satisfaire les dépendances d'un paquet donné et qui "
"ne sont plus nécessaires."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:323
msgid "changelog"
msgstr "changelog"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:324
msgid ""
"<literal>changelog</literal> downloads a package changelog and displays it "
"through <command>sensible-pager</command>. The server name and base "
@@ -3914,12 +3975,12 @@ msgstr ""
"<option>install</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:335
+#: apt-get.8.xml:346
msgid "<option>--no-install-recommends</option>"
msgstr "<option>--no-install-recommends</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:336
+#: apt-get.8.xml:347
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3928,12 +3989,12 @@ msgstr ""
"Élément de configuration : <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:340
+#: apt-get.8.xml:351
msgid "<option>--install-suggests</option>"
msgstr "<option>--install-suggests</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:341
+#: apt-get.8.xml:352
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
@@ -3942,12 +4003,12 @@ msgstr ""
"de configuration : <literal>APT::Install-Suggests</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:356
msgid "<option>--download-only</option>"
msgstr "<option>--download-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:357
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -3957,12 +4018,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:350
+#: apt-get.8.xml:361
msgid "<option>--fix-broken</option>"
msgstr "<option>--fix-broken</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:362
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -3990,17 +4051,17 @@ msgstr ""
"configuration : <literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:375
msgid "<option>--ignore-missing</option>"
msgstr "<option>--ignore-missing</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:365
+#: apt-get.8.xml:376
msgid "<option>--fix-missing</option>"
msgstr "<option>--fix-missing</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:366
+#: apt-get.8.xml:377
msgid ""
"Ignore missing packages; If packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -4020,12 +4081,12 @@ msgstr ""
"<literal>APT::Get::Fix-Missing</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:387
msgid "<option>--no-download</option>"
msgstr "<option>--no-download</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:388
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -4037,7 +4098,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:384
+#: apt-get.8.xml:395
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4059,17 +4120,17 @@ msgstr ""
"configuration : <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:405
msgid "<option>--simulate</option>"
msgstr "<option>--simulate</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:407
msgid "<option>--dry-run</option>"
msgstr "<option>--dry-run</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:410
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -4080,7 +4141,7 @@ msgstr ""
"<literal>APT::Get::Simulate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:414
msgid ""
"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
"literal>) automatic. Also a notice will be displayed indicating that this "
@@ -4099,7 +4160,7 @@ msgstr ""
"utile qu'<literal>apt-get</literal> envoie de telles notifications)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:420
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4112,22 +4173,22 @@ msgstr ""
"que les dommages n'ont aucune conséquence (rare)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>-y</option>"
msgstr "<option>-y</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>--yes</option>"
msgstr "<option>--yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:417
+#: apt-get.8.xml:428
msgid "<option>--assume-yes</option>"
msgstr "<option>--assume-yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:418
+#: apt-get.8.xml:429
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -4143,17 +4204,37 @@ msgstr ""
"configuration : <literal>APT::Get::Assume-Yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:436
+#, fuzzy
+#| msgid "<option>--assume-yes</option>"
+msgid "<option>--assume-no</option>"
+msgstr "<option>--assume-yes</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:437
+#, fuzzy
+#| msgid ""
+#| "Locations to fetch packages from. Configuration Item: <literal>Dir::Etc::"
+#| "SourceList</literal>."
+msgid ""
+"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+"Emplacements où aller chercher les paquets. Élément de configuration : "
+"<literal>Dir::Etc::SourceList</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:441
msgid "<option>-u</option>"
msgstr "<option>-u</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:441
msgid "<option>--show-upgraded</option>"
msgstr "<option>--show-upgraded</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:442
msgid ""
"Show upgraded packages; Print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4163,17 +4244,17 @@ msgstr ""
"Upgraded</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>-V</option>"
msgstr "<option>-V</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>--verbose-versions</option>"
msgstr "<option>--verbose-versions</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:448
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -4182,22 +4263,40 @@ msgstr ""
"Élément de configuration : <literal>APT::Get::Show-Versions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:453
+#, fuzzy
+#| msgid "<option>--recurse</option>"
+msgid "<option>--host-architecture</option>"
+msgstr "<option>--recurse</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:454
+msgid ""
+"This option controls the architecture packages are built for by <command>apt-"
+"get source --compile</command> and how cross-builddependencies are "
+"satisfied. By default is not set which means that the host architecture is "
+"the same as the build architecture (which is defined by <literal>APT::"
+"Architecture</literal>) Configuration Item: <literal>APT::Get::Host-"
+"Architecture</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:462
msgid "<option>-b</option>"
msgstr "<option>-b</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:462
msgid "<option>--compile</option>"
msgstr "<option>--compile</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:463
msgid "<option>--build</option>"
msgstr "<option>--build</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:464
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -4206,12 +4305,12 @@ msgstr ""
"configuration : <literal>APT::Get::Compile</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:468
msgid "<option>--ignore-hold</option>"
msgstr "<option>--ignore-hold</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:469
msgid ""
"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -4225,12 +4324,12 @@ msgstr ""
"<literal>APT::Ignore-Hold</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:475
msgid "<option>--no-upgrade</option>"
msgstr "<option>--no-upgrade</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:450
+#: apt-get.8.xml:476
msgid ""
"Do not upgrade packages; When used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4243,12 +4342,12 @@ msgstr ""
"Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:482
msgid "<option>--only-upgrade</option>"
msgstr "<option>--only-upgrade</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:483
msgid ""
"Do not install new packages; When used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -4262,12 +4361,12 @@ msgstr ""
"Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:489
msgid "<option>--force-yes</option>"
msgstr "<option>--force-yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:490
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -4283,12 +4382,12 @@ msgstr ""
"yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:497
msgid "<option>--print-uris</option>"
msgstr "<option>--print-uris</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:498
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -4310,12 +4409,12 @@ msgstr ""
"<literal>APT::Get::Print-URIs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:508
msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:509
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4329,12 +4428,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:516
msgid "<option>--reinstall</option>"
msgstr "<option>--reinstall</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:517
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4343,12 +4442,12 @@ msgstr ""
"Élément de configuration : <literal>APT::Get::ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:495
+#: apt-get.8.xml:521
msgid "<option>--list-cleanup</option>"
msgstr "<option>--list-cleanup</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:522
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -4366,17 +4465,17 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:505
+#: apt-get.8.xml:531
msgid "<option>--target-release</option>"
msgstr "<option>--target-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:532
msgid "<option>--default-release</option>"
msgstr "<option>--default-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:533
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -4398,12 +4497,12 @@ msgstr ""
"Release</literal>. Voyez aussi la page de manuel d'&apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:546
msgid "<option>--trivial-only</option>"
msgstr "<option>--trivial-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:522
+#: apt-get.8.xml:548
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4417,12 +4516,12 @@ msgstr ""
"Get::Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:554
msgid "<option>--no-remove</option>"
msgstr "<option>--no-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:555
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4432,12 +4531,12 @@ msgstr ""
"Remove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:534
+#: apt-get.8.xml:560
msgid "<option>--auto-remove</option>"
msgstr "<option>--auto-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:561
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4450,12 +4549,12 @@ msgstr ""
"inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:567
msgid "<option>--only-source</option>"
msgstr "<option>--only-source</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:568
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -4475,22 +4574,22 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--diff-only</option>"
msgstr "<option>--diff-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--dsc-only</option>"
msgstr "<option>--dsc-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--tar-only</option>"
msgstr "<option>--tar-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:553
+#: apt-get.8.xml:579
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4502,12 +4601,12 @@ msgstr ""
"literal>, "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:558
+#: apt-get.8.xml:584
msgid "<option>--arch-only</option>"
msgstr "<option>--arch-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:585
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -4517,12 +4616,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:589
msgid "<option>--allow-unauthenticated</option>"
msgstr "<option>--allow-unauthenticated</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:564
+#: apt-get.8.xml:590
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -4534,7 +4633,7 @@ msgstr ""
"AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:603
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
@@ -4543,7 +4642,7 @@ msgstr ""
"&file-statelists;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:612
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4554,7 +4653,7 @@ msgstr ""
"« HOWTO » d'APT."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:618
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -4563,22 +4662,22 @@ msgstr ""
"décimal 100 en cas d'erreur."
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:595
+#: apt-get.8.xml:621
msgid "ORIGINAL AUTHORS"
msgstr "AUTEURS D'ORIGINE"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:596
+#: apt-get.8.xml:622
msgid "&apt-author.jgunthorpe;"
msgstr "&apt-author.jgunthorpe;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:599
+#: apt-get.8.xml:625
msgid "CURRENT AUTHORS"
msgstr "AUTEURS ACTUELS"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:601
+#: apt-get.8.xml:627
msgid "&apt-author.team;"
msgstr "&apt-author.team;"
@@ -4703,14 +4802,33 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:131
msgid ""
-"Update the local keyring with the keyring of Debian archive keys and removes "
-"from the keyring the archive keys which are no longer valid."
+"Update the local keyring with the archive keyring and remove from the local "
+"keyring the archive keys which are no longer valid. The archive keyring is "
+"shipped in the <literal>archive-keyring</literal> package of your "
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:141
+#, fuzzy
+#| msgid "update"
+msgid "net-update"
+msgstr "update"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:145
+msgid ""
+"Work similar to the <command>update</command> command above, but get the "
+"archive keyring from an URI instead and validate it against a master key. "
+"This requires an installed &wget; and an APT build configured to have a "
+"server to fetch from and a master keyring to validate. APT in Debian does "
+"not support this command and relies on <command>update</command> instead, "
+"but Ubuntu's APT does."
msgstr ""
-"Mettre à jour le trousseau de clés local avec le trousseau de clés de "
-"l'archive Debian et supprimer les clés qui y sont périmées."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:162
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
@@ -4719,12 +4837,12 @@ msgstr ""
"décrites dans la section suivante."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:164
msgid "--keyring <replaceable>filename</replaceable>"
msgstr "--keyring <replaceable>fichier</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:165
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -4741,53 +4859,66 @@ msgstr ""
"les nouvelles clés y seront ajoutées."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:178
msgid "&file-trustedgpg;"
msgstr "&file-trustedgpg;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:180
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:181
msgid "Local trust database of archive keys."
msgstr "Base de données locale de fiabilité des clés de l'archive."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#: apt-key.8.xml:184
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
-msgid "Keyring of Debian archive trusted keys."
+#: apt-key.8.xml:185
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Trousseau des clés fiables de l'archive Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:188
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
-msgid "Keyring of Debian archive removed trusted keys."
+#: apt-key.8.xml:189
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:198
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
+#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+#| "August 2009</date>"
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
msgstr ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
"août 2009</date>"
@@ -4804,13 +4935,22 @@ msgstr "Indiquer si un paquet a été installé automatiquement ou non"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:39
+#, fuzzy
+#| msgid ""
+#| " <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
+#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
msgstr ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"plain\"> "
@@ -4820,7 +4960,7 @@ msgstr ""
"arg> <arg choice=\"plain\">showauto</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
@@ -4829,7 +4969,7 @@ msgstr ""
"a été automatiquement installé ou pas."
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4845,14 +4985,21 @@ msgstr ""
"command>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+#, fuzzy
+#| msgid "markauto"
+msgid "auto"
msgstr "markauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
+#, fuzzy
+#| msgid ""
+#| "<literal>markauto</literal> is used to mark a package as being "
+#| "automatically installed, which will cause the package to be removed when "
+#| "no more manually installed packages depend on this package."
msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
@@ -4861,14 +5008,19 @@ msgstr ""
"que plus aucun paquet installé manuellement ne dépend de lui."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
-msgstr "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
+msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
+#, fuzzy
+#| msgid ""
+#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
@@ -4877,28 +5029,102 @@ msgstr ""
"aucun autre paquet n'en dépend."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
+#: apt-mark.8.xml:85
+msgid "hold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:86
+msgid ""
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed. The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:96
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>showauto</literal>, affiche les paquets installés automatiquement, "
+"un paquet par ligne."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:101
msgid "showauto"
msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"installed packages with each package on a new line. All automatically "
+"installed packages will be listed if no package is given. If packages are "
+"given only those which are automatically installed will be shown."
msgstr ""
"<literal>showauto</literal>, affiche les paquets installés automatiquement, "
"un paquet par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:109
+#, fuzzy
+#| msgid "showauto"
+msgid "showmanual"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:116
+#, fuzzy
+#| msgid "showauto"
+msgid "showhold"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:117
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showauto</literal>, affiche les paquets installés automatiquement, "
+"un paquet par ligne."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:130
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
"<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:131
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -4907,7 +5133,7 @@ msgstr ""
"option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:134
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -4919,48 +5145,18 @@ msgstr ""
"par défaut (<filename>extended_status</filename> dans le répertoire défini "
"par l'élément de configuration <literal>Dir::State</literal>)."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
-msgstr "<option>-h</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
-msgstr "<option>--help</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
-msgstr "Affiche un résumé de l'aide"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
-msgstr "<option>-v</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
-msgstr "<option>--version</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
-msgstr "Affiche la version du programme."
-
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
msgid " &file-extended_states;"
msgstr " &file-extended_states;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-get;,&aptitude;,&apt-conf;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -5412,13 +5608,23 @@ msgstr ""
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:52
+#, fuzzy
+#| msgid ""
+#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+#| "order which have no or \"<literal>conf</literal>\" as filename extension "
+#| "and which only contain alphanumeric, hyphen (-), underscore (_) and "
+#| "period (.) characters. Otherwise APT will print a notice that it has "
+#| "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+#| "Ignore-Files-Silently</literal> configuration list - in this case it will "
+#| "be silently ignored."
msgid ""
"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
-"order which have no or \"<literal>conf</literal>\" as filename extension and "
-"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
-"characters. Otherwise APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters. Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
msgstr ""
"tous les fichiers de <literal>Dir::Etc::Parts</literal> dans l'ordre "
"alphanumérique ascendant qui ont soit l'extension \"<literal>conf</literal>"
@@ -5683,13 +5889,24 @@ msgstr ""
"utiliser pour récupérer des fichiers et analyser des listes de paquets. La "
"valeur interne par défaut est l'architecture pour laquelle APT a été compilé."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:158
+msgid ""
+"All Architectures the system supports. Processors implementing the "
+"<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
+"<literal>i386</literal>; This list is use when fetching files and parsing "
+"package lists. The internal default is always the native architecture "
+"(<literal>APT::Architecture</literal>) and all foreign architectures it can "
+"retrieve by calling <command>dpkg --print-foreign-architectures</command>."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:165
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:166
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5703,12 +5920,12 @@ msgstr ""
"&apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:171
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:164
+#: apt.conf.5.xml:172
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -5718,12 +5935,12 @@ msgstr ""
"décision."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:176
msgid "Clean-Installed"
msgstr "Clean-Installed"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:177
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -5737,12 +5954,12 @@ msgstr ""
"direct pour les réinstaller."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:175
+#: apt.conf.5.xml:183
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:176
+#: apt.conf.5.xml:184
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -5806,12 +6023,12 @@ msgstr ""
"utilisée afin qu'il soit étudié et corrigé."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:198
+#: apt.conf.5.xml:206
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:207
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -5829,12 +6046,12 @@ msgstr ""
"les paquets dont ces paquets dépendent."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:215
msgid "Cache-Start, Cache-Grow and Cache-Limit"
msgstr "Cache-Start, Cache-Grow et Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
+#: apt.conf.5.xml:216
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
@@ -5874,24 +6091,24 @@ msgstr ""
"l'augmentation automatique de la taille du cache est désactivée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:223
+#: apt.conf.5.xml:231
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:232
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
"Cette option définit les paquets qui sont considérés comme faisant partie "
"des dépendances essentielles pour la construction de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:235
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:236
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -5901,12 +6118,12 @@ msgstr ""
"question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:240
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:241
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -5916,12 +6133,12 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:245
msgid "CDROM"
msgstr "CDROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:238
+#: apt.conf.5.xml:246
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -5931,17 +6148,17 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:244
+#: apt.conf.5.xml:252
msgid "The Acquire Group"
msgstr "Le groupe Acquire"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:249
+#: apt.conf.5.xml:257
msgid "Check-Valid-Until"
msgstr "Check-Valid-Until"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:250
+#: apt.conf.5.xml:258
msgid ""
"Security related option defaulting to true as an expiring validation for a "
"Release file prevents longtime replay attacks and can e.g. also help users "
@@ -5961,22 +6178,69 @@ msgstr ""
"ValidTime</literal> est alors utilisée."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:260
+#: apt.conf.5.xml:268
msgid "Max-ValidTime"
msgstr "Max-ValidTime"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:261
-msgid ""
-"Seconds the Release file should be considered valid after it was created. "
-"The default is \"for ever\" (0) if the Release file of the archive doesn't "
-"include a <literal>Valid-Until</literal> header. If it does then this date "
-"is the default. The date from the Release file or the date specified by the "
-"creation time of the Release file (<literal>Date</literal> header) plus the "
-"seconds specified with this options are used to check if the validation of a "
-"file has expired by using the earlier date of the two. Archive specific "
-"settings can be made by appending the label of the archive to the option "
-"name."
+#: apt.conf.5.xml:269
+#, fuzzy
+#| msgid ""
+#| "Seconds the Release file should be considered valid after it was created. "
+#| "The default is \"for ever\" (0) if the Release file of the archive "
+#| "doesn't include a <literal>Valid-Until</literal> header. If it does then "
+#| "this date is the default. The date from the Release file or the date "
+#| "specified by the creation time of the Release file (<literal>Date</"
+#| "literal> header) plus the seconds specified with this options are used to "
+#| "check if the validation of a file has expired by using the earlier date "
+#| "of the two. Archive specific settings can be made by appending the label "
+#| "of the archive to the option name."
+msgid ""
+"Seconds the Release file should be considered valid after it was created "
+"(indicated by the <literal>Date</literal> header). If the Release file "
+"itself includes a <literal>Valid-Until</literal> header the earlier date of "
+"the two is used as the expiration date. The default value is <literal>0</"
+"literal> which stands for \"for ever\". Archive specific settings can be "
+"made by appending the label of the archive to the option name."
+msgstr ""
+"Durée (en secondes) pendant laquelle un fichier Release est considéré comme "
+"valable, à partir du moment de sa création. La valeur par défaut est 0 "
+"(fichier valable indéfiniment) si le fichier Release de l'archive ne "
+"comporte pas d'en-tête <literal>Valid-Until</literal>. Dans le cas "
+"contraire, c'est la valeur de cet en-tête qui est la valeur par défaut du "
+"paramètre. La date du fichier Release ou la date indiquée dans l'en-tête "
+"<literal>Date</literal>, augmentées du nombre de secondes indiquées sont "
+"comparées à la date courante pour déterminer si un fichier Release donné est "
+"obsolète ou pas. Un réglage spécifique pour une archive donnée peut être "
+"défini en ajoutant l'étiquette de l'archive au nom de l'option."
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:279
+#, fuzzy
+#| msgid "Max-ValidTime"
+msgid "Min-ValidTime"
+msgstr "Max-ValidTime"
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
+#, fuzzy
+#| msgid ""
+#| "Seconds the Release file should be considered valid after it was created. "
+#| "The default is \"for ever\" (0) if the Release file of the archive "
+#| "doesn't include a <literal>Valid-Until</literal> header. If it does then "
+#| "this date is the default. The date from the Release file or the date "
+#| "specified by the creation time of the Release file (<literal>Date</"
+#| "literal> header) plus the seconds specified with this options are used to "
+#| "check if the validation of a file has expired by using the earlier date "
+#| "of the two. Archive specific settings can be made by appending the label "
+#| "of the archive to the option name."
+msgid ""
+"Minimum of seconds the Release file should be considered valid after it was "
+"created (indicated by the <literal>Date</literal> header). Use this if you "
+"need to use a seldomly updated (local) mirror of a more regular updated "
+"archive with a <literal>Valid-Until</literal> header instead of competely "
+"disabling the expiration date checking. Archive specific settings can and "
+"should be used by appending the label of the archive to the option name."
msgstr ""
"Durée (en secondes) pendant laquelle un fichier Release est considéré comme "
"valable, à partir du moment de sa création. La valeur par défaut est 0 "
@@ -5990,12 +6254,12 @@ msgstr ""
"défini en ajoutant l'étiquette de l'archive au nom de l'option."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:290
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:274
+#: apt.conf.5.xml:291
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6005,12 +6269,20 @@ msgstr ""
"télécharger entièrement. Par défaut à « true »."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:294
+#, fuzzy
+#| msgid ""
+#| "Two sub-options to limit the use of PDiffs are also available: With "
+#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
+#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+#| "other hand is the maximum percentage of the size of all patches compared "
+#| "to the size of the targeted file. If one of these limits is exceeded the "
+#| "complete file is downloaded instead of the patches."
msgid ""
"Two sub-options to limit the use of PDiffs are also available: With "
"<literal>FileLimit</literal> can be specified how many PDiff files are "
"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum precentage of the size of all patches compared to "
+"other hand is the maximum percentage of the size of all patches compared to "
"the size of the targeted file. If one of these limits is exceeded the "
"complete file is downloaded instead of the patches."
msgstr ""
@@ -6024,12 +6296,12 @@ msgstr ""
"fichiers de différences."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:303
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:304
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6045,12 +6317,12 @@ msgstr ""
"initiée."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:311
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#: apt.conf.5.xml:312
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6060,12 +6332,12 @@ msgstr ""
"échoué."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:299
+#: apt.conf.5.xml:316
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:300
+#: apt.conf.5.xml:317
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6075,12 +6347,12 @@ msgstr ""
"archives de sources au lieu de les copier. Par défaut à « true »."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304 sources.list.5.xml:144
+#: apt.conf.5.xml:321 sources.list.5.xml:160
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:322
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6100,7 +6372,7 @@ msgstr ""
"options de mandataire HTTP."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#: apt.conf.5.xml:330
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6125,7 +6397,7 @@ msgstr ""
"en compte aucune de ces options."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323 apt.conf.5.xml:387
+#: apt.conf.5.xml:340 apt.conf.5.xml:404
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6136,7 +6408,7 @@ msgstr ""
"données."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:343
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -6156,7 +6428,7 @@ msgstr ""
"cette option ne respectent pas la RFC 2068."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:351
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6171,7 +6443,7 @@ msgstr ""
"implicitement le téléchargement simultané depuis plusieurs serveurs."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:339
+#: apt.conf.5.xml:356
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -6183,12 +6455,12 @@ msgstr ""
"n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:362
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:363
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -6204,7 +6476,7 @@ msgstr ""
"encore gérée."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:352
+#: apt.conf.5.xml:369
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6236,12 +6508,12 @@ msgstr ""
"ou 'SSLv3'."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:370 sources.list.5.xml:155
+#: apt.conf.5.xml:387 sources.list.5.xml:171
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:388
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6276,7 +6548,7 @@ msgstr ""
"correspond à l'élément respectif de l'URI."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:407
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -6293,7 +6565,7 @@ msgstr ""
"modèle de fichier de configuration)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:414
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6308,7 +6580,7 @@ msgstr ""
"efficacité de cette méthode."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:419
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6324,18 +6596,18 @@ msgstr ""
"des serveurs FTP ne suivent pas la RFC 2428."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:409 sources.list.5.xml:137
+#: apt.conf.5.xml:426 sources.list.5.xml:153
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:415
+#: apt.conf.5.xml:432
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#: apt.conf.5.xml:427
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6357,12 +6629,12 @@ msgstr ""
"spécifiées en utilisant <literal>UMount</literal>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:437
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:421
+#: apt.conf.5.xml:438
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6373,18 +6645,18 @@ msgstr ""
"supplémentaires passées à gpgv."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:443
msgid "CompressionTypes"
msgstr "CompressionTypes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:449
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:427
+#: apt.conf.5.xml:444
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6404,19 +6676,19 @@ msgstr ""
"type=\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:454
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:457
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:433
+#: apt.conf.5.xml:450
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6447,20 +6719,32 @@ msgstr ""
"<literal>bz2</literal> à liste car il sera ajouté automatiquement."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:461
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:442
+#: apt.conf.5.xml:459
+#, fuzzy
+#| msgid ""
+#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
+#| "replaceable></literal> will be checked: If this setting exists the method "
+#| "will only be used if this file exists, e.g. for the bzip2 method (the "
+#| "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note "
+#| "also that list entries specified on the command line 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 "
+#| "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."
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
"will only be used if this file exists, e.g. for the bzip2 method (the "
-"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
-"that list entries specified on the command line will be added at the end of "
-"the list specified in the configuration files, but before the default "
+"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+"also that list entries specified on the command line 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 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 "
@@ -6479,10 +6763,16 @@ msgstr ""
"elle sera simplement préfixée avec l'option en question."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:466
+#, fuzzy
+#| msgid ""
+#| "The special type <literal>uncompressed</literal> can be used to give "
+#| "uncompressed files a preference, but note that most archives doesn't "
+#| "provide uncompressed files so this is mostly only useable for local "
+#| "mirrors."
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
"uncompressed files so this is mostly only useable for local mirrors."
msgstr ""
"Le type spécial <literal>uncompressed</literal> peut servir à donner la "
@@ -6491,12 +6781,12 @@ msgstr ""
"surtout destiné aux miroirs locaux."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:454
+#: apt.conf.5.xml:471
msgid "GzipIndexes"
msgstr "GzipIndexes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:473
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -6511,12 +6801,12 @@ msgstr ""
"(« False »)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:463
+#: apt.conf.5.xml:480
msgid "Languages"
msgstr "Langues"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:481
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
@@ -6538,13 +6828,13 @@ msgstr ""
"sur ce qui est disponible avant d'établir des réglages impossibles."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:480
+#: apt.conf.5.xml:497
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:487
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -6586,7 +6876,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:253
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6596,12 +6886,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:487
+#: apt.conf.5.xml:504
msgid "Directories"
msgstr "Les répertoires"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:506
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6621,7 +6911,7 @@ msgstr ""
"filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:513
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6644,7 +6934,7 @@ msgstr ""
"Cache</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:522
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6659,7 +6949,7 @@ msgstr ""
"fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:528
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -6670,7 +6960,7 @@ msgstr ""
"configuration est chargé."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:532
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6688,7 +6978,7 @@ msgstr ""
"programmes correspondants."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:540
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6710,7 +7000,7 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:553
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -6728,12 +7018,12 @@ msgstr ""
"est possible d'utiliser la syntaxe des expressions rationnelles."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:562
msgid "APT in DSelect"
msgstr "APT et DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:564
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6744,12 +7034,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:551
+#: apt.conf.5.xml:568
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:569
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6767,7 +7057,7 @@ msgstr ""
"supprime avant de récupérer de nouveaux paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:578
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6776,12 +7066,12 @@ msgstr ""
"&apt-get; lors de la phase d'installation."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:582
msgid "Updateoptions"
msgstr "UpdateOptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:583
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6790,12 +7080,12 @@ msgstr ""
"&apt-get; lors de la phase de mise à jour."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:587
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:588
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6805,12 +7095,12 @@ msgstr ""
"d'erreur que l'on propose à l'utilisateur d'intervenir."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:594
msgid "How APT calls dpkg"
msgstr "Méthode d'appel de &dpkg; par APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:595
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6819,7 +7109,7 @@ msgstr ""
"&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:583
+#: apt.conf.5.xml:600
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -6830,17 +7120,17 @@ msgstr ""
"est passé comme un seul paramètre à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:606
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6853,12 +7143,12 @@ msgstr ""
"<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:612
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:613
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6874,7 +7164,7 @@ msgstr ""
"qu'il va installer, à raison d'un par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:619
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6890,12 +7180,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:626
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:627
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6904,12 +7194,12 @@ msgstr ""
"le répertoire <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:631
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:615
+#: apt.conf.5.xml:632
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6919,14 +7209,14 @@ msgstr ""
"créés."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:637
msgid "dpkg trigger usage (and related options)"
msgstr ""
"utilisation des actions différées (« triggers ») de dpkg (et options "
"associées)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:638
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiple calls of dpkg. Without further options dpkg will use triggers only "
@@ -6953,7 +7243,7 @@ msgstr ""
"configuration des paquets."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:653
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6967,7 +7257,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:647
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -6991,12 +7281,12 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:642
+#: apt.conf.5.xml:659
msgid "DPkg::NoTriggers"
msgstr "DPkg::NoTriggers"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:660
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -7018,12 +7308,12 @@ msgstr ""
"options « unpack » et « remove »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:650
+#: apt.conf.5.xml:667
msgid "PackageManager::Configure"
msgstr "PackageManager::Configure"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:668
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7051,12 +7341,12 @@ msgstr ""
"configuré et donc éventuellement non amorçable."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:678
msgid "DPkg::ConfigurePending"
msgstr "DPkg::ConfigurePending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:662
+#: apt.conf.5.xml:679
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -7075,12 +7365,12 @@ msgstr ""
"peut conserver l'option active."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:685
msgid "DPkg::TriggersPending"
msgstr "DPkg::TriggersPending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:669
+#: apt.conf.5.xml:686
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7098,12 +7388,12 @@ msgstr ""
"celles concernant le paquet en cours de traitement."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:691
msgid "PackageManager::UnpackAll"
msgstr "PackageManager::UnpackAll"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:675
+#: apt.conf.5.xml:692
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-"
@@ -7128,12 +7418,12 @@ msgstr ""
"traduction n'est pas exclu...)."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:699
msgid "OrderList::Score::Immediate"
msgstr "OrderList::Score::Immediate"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:707
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7151,7 +7441,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:700
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 "
@@ -7177,12 +7467,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:720
msgid "Periodic and Archives options"
msgstr "Options « Periodic » et « Archive »"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:721
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7194,12 +7484,12 @@ msgstr ""
"script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:729
msgid "Debug options"
msgstr "Les options de débogage"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:731
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7217,7 +7507,7 @@ msgstr ""
"peuvent tout de même être utiles :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:742
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7228,7 +7518,7 @@ msgstr ""
"upgrade, upgrade, install, remove et purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:750
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7240,7 +7530,7 @@ msgstr ""
"superutilisateur."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:759
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7252,7 +7542,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:750
+#: apt.conf.5.xml:767
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -7261,17 +7551,17 @@ msgstr ""
"type statfs dans les identifiants de CD."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:777
msgid "A full list of debugging options to apt follows."
msgstr "Liste complète des options de débogage de APT :"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:782
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:769
+#: apt.conf.5.xml:786
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -7279,44 +7569,44 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:793
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:780
+#: apt.conf.5.xml:797
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:787
+#: apt.conf.5.xml:804
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:791
+#: apt.conf.5.xml:808
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:798
+#: apt.conf.5.xml:815
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:802
+#: apt.conf.5.xml:819
msgid "Print information related to downloading packages using HTTPS."
msgstr "Print information related to downloading packages using HTTPS."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:826
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:813
+#: apt.conf.5.xml:830
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7325,12 +7615,12 @@ msgstr ""
"cryptographiques avec <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:820
+#: apt.conf.5.xml:837
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:841
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -7339,24 +7629,24 @@ msgstr ""
"stockées sur CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:848
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:851
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Décrit le processus de résolution des dépendances pour la construction de "
"paquets source ( « build-dependencies » ) par &apt-get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:858
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:861
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7365,12 +7655,12 @@ msgstr ""
"librairies d'<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:868
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:871
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 "
@@ -7381,12 +7671,12 @@ msgstr ""
"utilisés sur le système de fichier du CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:879
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:882
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."
@@ -7396,24 +7686,24 @@ msgstr ""
"temps."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:873
+#: apt.conf.5.xml:890
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:894
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Trace les ajouts et suppressions d'éléments de la queue globale de "
"téléchargement."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:884
+#: apt.conf.5.xml:901
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:887
+#: apt.conf.5.xml:904
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7423,12 +7713,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:894
+#: apt.conf.5.xml:911
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:897
+#: apt.conf.5.xml:914
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7438,12 +7728,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:905
+#: apt.conf.5.xml:922
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:909
+#: apt.conf.5.xml:926
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7453,12 +7743,12 @@ msgstr ""
"place des fichiers complets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:916
+#: apt.conf.5.xml:933
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:920
+#: apt.conf.5.xml:937
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -7466,12 +7756,12 @@ msgstr ""
"effectivement des téléchargements."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:927
+#: apt.conf.5.xml:944
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:948
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7480,12 +7770,12 @@ msgstr ""
"automatiquement, et la suppression des paquets inutiles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:955
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:941
+#: apt.conf.5.xml:958
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7500,12 +7790,12 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:969
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:955
+#: apt.conf.5.xml:972
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7540,24 +7830,24 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:991
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:994
msgid "Dump the default configuration to standard error on startup."
msgstr ""
"Affiche, au lancement, l'ensemble de la configuration sur la sortie d'erreur "
"standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:984
+#: apt.conf.5.xml:1001
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:987
+#: apt.conf.5.xml:1004
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7566,12 +7856,12 @@ msgstr ""
"paramètres sont séparés par des espaces."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1012
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:998
+#: apt.conf.5.xml:1015
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7581,12 +7871,12 @@ msgstr ""
"fichier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1022
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1009
+#: apt.conf.5.xml:1026
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7595,33 +7885,33 @@ msgstr ""
"<literal>apt</literal> passe les paquets à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1034
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1021
+#: apt.conf.5.xml:1038
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:1028
+#: apt.conf.5.xml:1045
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1032
+#: apt.conf.5.xml:1049
msgid "Output the priority of each package list on startup."
msgstr "Affiche, au lancement, la priorité de chaque liste de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1055
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1042
+#: apt.conf.5.xml:1059
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7630,12 +7920,12 @@ 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:1050
+#: apt.conf.5.xml:1067
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:1053
+#: apt.conf.5.xml:1070
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 "
@@ -7646,12 +7936,12 @@ msgstr ""
"est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1078
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1065
+#: apt.conf.5.xml:1082
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7660,7 +7950,7 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1088
+#: apt.conf.5.xml:1105
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7669,13 +7959,13 @@ msgstr ""
"exemples pour toutes les options existantes."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1112
msgid "&file-aptconf;"
msgstr "&file-aptconf;"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1100
+#: apt.conf.5.xml:1117
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7770,11 +8060,21 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:70
+#, fuzzy
+#| msgid ""
+#| "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+#| "directory are parsed in alphanumeric ascending order and need to obey the "
+#| "following naming convention: The files have no or \"<literal>pref</"
+#| "literal>\" as filename extension and which only contain alphanumeric, "
+#| "hyphen (-), underscore (_) and period (.) characters. Otherwise APT will "
+#| "print a notice that it has ignored a file if the file doesn't match a "
+#| "pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+#| "configuration list - in this case it will be silently ignored."
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
-"following naming convention: The files have no or \"<literal>pref</literal>"
-"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
"that it has ignored a file if the file doesn't match a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@ -8230,17 +8530,84 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+#, fuzzy
+#| msgid "Packages"
+msgid "Package"
+msgstr "Packages"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
msgid "How APT Interprets Priorities"
msgstr "Méthode d'interprétation des priorités par APT"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:314
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:315
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8249,12 +8616,12 @@ msgstr ""
"retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:319
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8264,12 +8631,12 @@ msgstr ""
"plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:325
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:326
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8278,12 +8645,12 @@ msgstr ""
"distribution par défaut ou si la version installée est plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:288
+#: apt_preferences.5.xml:331
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:332
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8292,29 +8659,29 @@ msgstr ""
"autre distribution ou si la version installée est plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:337
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:338
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr "la version sera installée si aucune version du paquet n'est installée."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:342
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:343
msgid "prevents the version from being installed"
msgstr "cette priorité empêche l'installation de la version."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:309
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8325,7 +8692,7 @@ msgstr ""
"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:348
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8339,7 +8706,7 @@ msgstr ""
"trouvée détermine la priorité."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:354
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8348,7 +8715,7 @@ msgstr ""
"entrées décrites ci-dessous :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:358
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8376,12 +8743,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:371
msgid "Then:"
msgstr "Alors :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:373
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8395,7 +8762,7 @@ msgstr ""
"installée est une version 5.9*, il y aura un retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:378
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8406,7 +8773,7 @@ msgstr ""
"appartenant à la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:382
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8419,13 +8786,13 @@ msgstr ""
"paquet n'est déjà installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:392
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
"Détermination de la version des paquets et des propriétés des distributions"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:394
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8436,27 +8803,27 @@ msgstr ""
"décrivent les paquets disponibles à cet endroit."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:406
msgid "the <literal>Package:</literal> line"
msgstr "la ligne <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:364
+#: apt_preferences.5.xml:407
msgid "gives the package name"
msgstr "donne le nom du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
msgid "the <literal>Version:</literal> line"
msgstr "la ligne <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:411
msgid "gives the version number for the named package"
msgstr "donne le numéro de version du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:398
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8477,12 +8844,12 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:427
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:428
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8499,18 +8866,18 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:438
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:444
msgid "the <literal>Codename:</literal> line"
msgstr "la ligne <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:445
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -8528,13 +8895,13 @@ msgstr ""
"ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:454
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:461
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8550,7 +8917,7 @@ msgstr ""
"préférences demanderait ces lignes :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:470
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8562,12 +8929,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:479
msgid "the <literal>Component:</literal> line"
msgstr "La ligne <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:480
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8585,18 +8952,18 @@ msgstr ""
"fichier des préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:446
+#: apt_preferences.5.xml:489
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:452
+#: apt_preferences.5.xml:495
msgid "the <literal>Origin:</literal> line"
msgstr "La ligne <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:453
+#: apt_preferences.5.xml:496
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8609,18 +8976,18 @@ msgstr ""
"ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:459
+#: apt_preferences.5.xml:502
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:465
+#: apt_preferences.5.xml:508
msgid "the <literal>Label:</literal> line"
msgstr "La ligne <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:509
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8633,13 +9000,13 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:515
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:416
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8663,7 +9030,7 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:522
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8688,12 +9055,12 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:535
msgid "Optional Lines in an APT Preferences Record"
msgstr "Lignes facultatives dans le fichier des préférences"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:494
+#: apt_preferences.5.xml:537
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8704,12 +9071,12 @@ msgstr ""
"commentaires."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:503
+#: apt_preferences.5.xml:546
msgid "Tracking Stable"
msgstr "Méthode pour suivre Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:554
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8733,7 +9100,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8748,8 +9115,8 @@ msgstr ""
"literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8761,7 +9128,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:566
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8774,13 +9141,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:583
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:577
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8793,12 +9160,12 @@ msgstr ""
"de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:589
msgid "Tracking Testing or Unstable"
msgstr "Méthode pour suivre Testing ou Unstable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:555
+#: apt_preferences.5.xml:598
#, no-wrap
msgid ""
"Package: *\n"
@@ -8826,7 +9193,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:591
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8843,7 +9210,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:612
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8856,13 +9223,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:632
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:623
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -8881,12 +9248,12 @@ msgstr ""
"installée. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:596
+#: apt_preferences.5.xml:639
msgid "Tracking the evolution of a codename release"
msgstr "Suivre l'évolution d'une version par son nom de code"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:610
+#: apt_preferences.5.xml:653
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8920,7 +9287,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:641
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8944,7 +9311,7 @@ msgstr ""
"exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:670
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -8957,13 +9324,13 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:647
+#: apt_preferences.5.xml:690
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:681
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -8982,12 +9349,12 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:699
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:662
+#: apt_preferences.5.xml:705
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -9107,8 +9474,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:81
-#, no-wrap
-msgid "deb uri distribution [component1] [component2] [...]"
+#, fuzzy, no-wrap
+#| msgid "deb uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri distribution [component1] [component2] [...]"
msgstr "deb uri distribution [composant1] [composant2] [...]"
#. type: Content of: <refentry><refsect1><para>
@@ -9179,6 +9547,38 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:112
msgid ""
+"<literal>options</literal> is always optional and needs to be surounded by "
+"square brackets. It can consist of multiple settings in the form "
+"<literal><replaceable>setting</replaceable>=<replaceable>value</"
+"replaceable></literal>. Multiple settings are separated by spaces. The "
+"following settings are supported by APT, note through that unsupported "
+"settings will be ignored silently:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:117
+msgid ""
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> can be used to specify for which architectures "
+"packages information should be downloaded. If this option is not set all "
+"architectures defined by the <literal>APT::Architectures</literal> option "
+"will be downloaded."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:128
+msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@ -9190,12 +9590,12 @@ msgstr ""
"les hôtes distants."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:133
msgid "Some examples:"
msgstr "Exemples :"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:119
+#: sources.list.5.xml:135
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -9207,17 +9607,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:125
+#: sources.list.5.xml:141
msgid "URI specification"
msgstr "Spécification des URI"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:146
msgid "file"
msgstr "file"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:132
+#: sources.list.5.xml:148
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -9228,7 +9628,7 @@ msgstr ""
"avec les montages NFS, les miroirs et les archives locaux."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:155
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -9238,7 +9638,7 @@ msgstr ""
"pour créer des entrées dans la liste des sources."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:162
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9255,7 +9655,7 @@ msgstr ""
"Notez qu'il s'agit d'une méthode d'authentification peu sûre."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:173
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -9275,12 +9675,12 @@ msgstr ""
"et qui sont spécifiés dans le fichier de configuration seront ignorés."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:182
msgid "copy"
msgstr "copy"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:184
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -9292,17 +9692,17 @@ msgstr ""
"gens qui utilisent un disque zip pour recopier des fichiers avec APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "rsh"
msgstr "rsh"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "ssh"
msgstr "ssh"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:191
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -9317,12 +9717,12 @@ msgstr ""
"commandes standard <command>find</command> et <command>dd</command>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:199
msgid "more recognizable URI types"
msgstr "plus de types d'URI simples à reconnaître"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:185
+#: sources.list.5.xml:201
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
@@ -9344,7 +9744,7 @@ msgstr ""
"citerefentry>)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:143
msgid ""
"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -9353,7 +9753,7 @@ msgstr ""
"ssh et rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:215
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -9362,37 +9762,60 @@ msgstr ""
"debian pour stable/main, stable/contrib et stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:203
+#: sources.list.5.xml:219
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Comme ci-dessus, excepté que cette ligne utilise la distribution "
"« unstable » (développement)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:220
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:222
msgid "Source line for the above"
msgstr "La précédente ligne, mais pour les sources."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:223
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:209
+#: sources.list.5.xml:225
+msgid ""
+"The first line gets package information for the architectures in "
+"<literal>APT::Architectures</literal> while the second always retrieves "
+"<literal>amd64</literal> and <literal>armel</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:227
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#| " "
+msgid ""
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgstr ""
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+" "
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:230
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -9401,13 +9824,13 @@ msgstr ""
"n'utiliser que la section hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:211
+#: sources.list.5.xml:232
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:234
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -9416,13 +9839,13 @@ msgstr ""
"répertoire debian, et n'utiliser que la section &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:236
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:238
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -9435,19 +9858,19 @@ msgstr ""
"apparaissent, une seule session FTP sera utilisée pour les deux lignes."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:251
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:244
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -9467,7 +9890,7 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:256
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
@@ -11033,6 +11456,34 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
+#~ msgid ""
+#~ "Update the local keyring with the keyring of Debian archive keys and "
+#~ "removes from the keyring the archive keys which are no longer valid."
+#~ msgstr ""
+#~ "Mettre à jour le trousseau de clés local avec le trousseau de clés de "
+#~ "l'archive Debian et supprimer les clés qui y sont périmées."
+
+#~ msgid "unmarkauto"
+#~ msgstr "unmarkauto"
+
+#~ msgid "<option>-h</option>"
+#~ msgstr "<option>-h</option>"
+
+#~ msgid "<option>--help</option>"
+#~ msgstr "<option>--help</option>"
+
+#~ msgid "Show a short usage summary."
+#~ msgstr "Affiche un résumé de l'aide"
+
+#~ msgid "<option>-v</option>"
+#~ msgstr "<option>-v</option>"
+
+#~ msgid "<option>--version</option>"
+#~ msgstr "<option>--version</option>"
+
+#~ msgid "Show the program version."
+#~ msgstr "Affiche la version du programme."
+
#~ msgid "to the version that is already installed (if any)."
#~ msgstr "est affectée à la version déjà installée (si elle existe)."
@@ -11207,13 +11658,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
#~ msgid "<filename>/etc/apt/sources.list</filename>"
#~ msgstr "<filename>/etc/apt/sources.list</filename>"
-#~ msgid ""
-#~ "Locations to fetch packages from. Configuration Item: <literal>Dir::Etc::"
-#~ "SourceList</literal>."
-#~ msgstr ""
-#~ "Emplacements où aller chercher les paquets. Élément de configuration : "
-#~ "<literal>Dir::Etc::SourceList</literal>."
-
#~ msgid "<filename>&statedir;/lists/</filename>"
#~ msgstr "<filename>&statedir;/lists/</filename>"
diff --git a/doc/po/it.po b/doc/po/it.po
index dec77747d..5fb3ff3fb 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2011-04-05 10:22+0300\n"
+"POT-Creation-Date: 2011-11-10 16:42+0100\n"
"PO-Revision-Date: 2003-04-26 23:26+0100\n"
"Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
"Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -531,8 +531,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
msgid "Description"
@@ -548,7 +548,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:120
+#: apt-cache.8.xml:70 apt-get.8.xml:127
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -910,8 +910,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
+#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
msgid "options"
msgstr ""
@@ -934,7 +934,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
#: apt-sortpkgs.1.xml:61
msgid "<option>-s</option>"
msgstr ""
@@ -955,12 +955,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>-q</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>--quiet</option>"
msgstr ""
@@ -1035,14 +1035,14 @@ msgstr ""
#: apt-cache.8.xml:317
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be twicked with these flags which will omit "
+"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
"Cache::ShowRecommends</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
+#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
msgid "<option>-f</option>"
msgstr ""
@@ -1059,7 +1059,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+#: apt-get.8.xml:452
msgid "<option>-a</option>"
msgstr ""
@@ -1155,14 +1156,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:596
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
+#: apt-cache.8.xml:372 apt-get.8.xml:601 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt.conf.5.xml:1110 apt_preferences.5.xml:697
msgid "Files"
msgstr ""
@@ -1173,10 +1174,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
-#: sources.list.5.xml:234
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:611
+#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
msgid "See Also"
msgstr ""
@@ -1187,8 +1188,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:617
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr ""
@@ -1287,12 +1288,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:161
msgid "Options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
msgid "<option>-d</option>"
msgstr ""
@@ -1328,7 +1329,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:364
+#: apt-cdrom.8.xml:116 apt-get.8.xml:375
msgid "<option>-m</option>"
msgstr ""
@@ -1373,17 +1374,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:395
+#: apt-cdrom.8.xml:143 apt-get.8.xml:406
msgid "<option>--just-print</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:397
+#: apt-cdrom.8.xml:144 apt-get.8.xml:408
msgid "<option>--recon</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:398
+#: apt-cdrom.8.xml:145 apt-get.8.xml:409
msgid "<option>--no-act</option>"
msgstr ""
@@ -1496,7 +1497,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
#: apt-sortpkgs.1.xml:73
msgid "&apt-conf;"
msgstr ""
@@ -1557,7 +1558,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
+#: apt-extracttemplates.1.xml:63 apt-get.8.xml:530
msgid "<option>-t</option>"
msgstr ""
@@ -1759,7 +1760,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:287
+#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
msgid "clean"
msgstr ""
@@ -2217,8 +2218,8 @@ msgid ""
"free</literal>"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
msgid "Architectures"
msgstr ""
@@ -2419,26 +2420,26 @@ msgid ""
"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
"replaceable>::<replaceable>Checksum</replaceable></literal> where "
-"<literal>Index</literal> can be <literal>Packages</literal>, "
-"<literal>Sources</literal> or <literal>Release</literal> and "
-"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
-"literal> or <literal>SHA256</literal>."
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:539
+#: apt-ftparchive.1.xml:540
msgid "<option>--db</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:547
+#: apt-ftparchive.1.xml:548
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2447,12 +2448,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
msgid "<option>--delink</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:556
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -2461,12 +2462,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
msgid "<option>--contents</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -2476,12 +2477,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:571
+#: apt-ftparchive.1.xml:572
msgid "<option>--source-override</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2489,24 +2490,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:578
msgid "<option>--readonly</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:580
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:584
msgid "<option>--arch</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:585
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2515,12 +2516,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:590
+#: apt-ftparchive.1.xml:591
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -2534,12 +2535,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:602
+#: apt-ftparchive.1.xml:603
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:605
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2549,26 +2550,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
-#: sources.list.5.xml:198
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:618
+#: apt-ftparchive.1.xml:619
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:632
+#: apt-ftparchive.1.xml:633
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -2600,10 +2601,11 @@ msgid ""
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <group choice=\"req\"> <arg "
-"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
-"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
-"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
+"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
+"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
+"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
+"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
+"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
@@ -2625,7 +2627,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:115
+#: apt-get.8.xml:122
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
@@ -2634,13 +2636,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:124 apt-key.8.xml:127
+#: apt-get.8.xml:131 apt-key.8.xml:127
#, fuzzy
msgid "update"
msgstr "upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:132
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources. The indexes of available packages are fetched from the "
@@ -2654,13 +2656,13 @@ msgid ""
msgstr ""
#. type: <tag></tag>
-#: apt-get.8.xml:136 guide.sgml:121
+#: apt-get.8.xml:143 guide.sgml:121
#, fuzzy
msgid "upgrade"
msgstr "upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:137
+#: apt-get.8.xml:144
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -2675,13 +2677,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:149
+#: apt-get.8.xml:156
#, fuzzy
msgid "dselect-upgrade"
msgstr "dist-upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:150
+#: apt-get.8.xml:157
msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -2692,13 +2694,13 @@ msgid ""
msgstr ""
#. type: <tag></tag>
-#: apt-get.8.xml:159 guide.sgml:140
+#: apt-get.8.xml:166 guide.sgml:140
#, fuzzy
msgid "dist-upgrade"
msgstr "dist-upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:167
msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -2712,13 +2714,13 @@ msgid ""
msgstr ""
#. type: <tag></tag>
-#: apt-get.8.xml:172 guide.sgml:131
+#: apt-get.8.xml:179 guide.sgml:131
#, fuzzy
msgid "install"
msgstr "install"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:181
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
@@ -2734,7 +2736,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:199
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -2745,14 +2747,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:206
msgid ""
"Both of the version selection mechanisms can downgrade packages and must be "
"used with care."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:202
+#: apt-get.8.xml:209
msgid ""
"This is also the target to use if you want to upgrade one or more already-"
"installed packages without upgrading every package you have on your system. "
@@ -2764,14 +2766,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:220
msgid ""
"Finally, the &apt-preferences; mechanism allows you to create an alternative "
"installation policy for individual packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:224
msgid ""
"If no package matches the given expression and the expression contains one "
"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -2783,12 +2785,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:233
msgid "remove"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:227
+#: apt-get.8.xml:234
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note the removing a package "
@@ -2798,12 +2800,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:241
msgid "purge"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:235
+#: apt-get.8.xml:242
msgid ""
"<literal>purge</literal> is identical to <literal>remove</literal> except "
"that packages are removed and purged (any configuration files are deleted "
@@ -2811,12 +2813,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:246
msgid "source"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:240
+#: apt-get.8.xml:247
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -2828,7 +2830,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:248
+#: apt-get.8.xml:255
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
"src</literal> type lines in the &sources-list; file. This means that you "
@@ -2838,16 +2840,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:262
msgid ""
"If the <option>--compile</option> option is specified then the package will "
-"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
-"<option>--download-only</option> is specified then the source package will "
-"not be unpacked."
+"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+"the architecture as defined by the <command>--host-architecture</command> "
+"option. If <option>--download-only</option> is specified then the source "
+"package will not be unpacked."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:260
+#: apt-get.8.xml:269
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -2857,7 +2860,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:275
msgid ""
"Note that source packages are not tracked like binary packages, they exist "
"only in the current directory and are similar to downloading source tar "
@@ -2865,43 +2868,46 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:280
msgid "build-dep"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:281
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
-"attempt to satisfy the build dependencies for a source package."
+"attempt to satisfy the build dependencies for a source package. By default "
+"the dependencies are satisfied to build the package nativly. If desired a "
+"host-architecture can be specified with the <option>--host-architecture</"
+"option> option instead."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:276
+#: apt-get.8.xml:287
msgid "check"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:288
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:292
msgid "download"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:293
msgid ""
"<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:299
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -2913,12 +2919,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid "autoclean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:298
+#: apt-get.8.xml:309
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -2930,25 +2936,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:307
+#: apt-get.8.xml:318
msgid "autoremove"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:319
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for some package and that "
-"are no more needed."
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:323
msgid "changelog"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:324
msgid ""
"<literal>changelog</literal> downloads a package changelog and displays it "
"through <command>sensible-pager</command>. The server name and base "
@@ -2961,48 +2967,48 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:335
+#: apt-get.8.xml:346
msgid "<option>--no-install-recommends</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:336
+#: apt-get.8.xml:347
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:340
+#: apt-get.8.xml:351
msgid "<option>--install-suggests</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:341
+#: apt-get.8.xml:352
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:356
msgid "<option>--download-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:357
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:350
+#: apt-get.8.xml:361
msgid "<option>--fix-broken</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:362
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -3018,17 +3024,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:375
msgid "<option>--ignore-missing</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:365
+#: apt-get.8.xml:376
msgid "<option>--fix-missing</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:366
+#: apt-get.8.xml:377
msgid ""
"Ignore missing packages; If packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -3040,12 +3046,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:387
msgid "<option>--no-download</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:388
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -3053,7 +3059,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:384
+#: apt-get.8.xml:395
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3065,17 +3071,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:405
msgid "<option>--simulate</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:407
msgid "<option>--dry-run</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:410
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -3083,7 +3089,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:414
msgid ""
"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
"literal>) automatic. Also a notice will be displayed indicating that this "
@@ -3094,7 +3100,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:420
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -3103,22 +3109,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>-y</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>--yes</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:417
+#: apt-get.8.xml:428
msgid "<option>--assume-yes</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:418
+#: apt-get.8.xml:429
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -3128,68 +3134,96 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:436
+msgid "<option>--assume-no</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:437
+msgid ""
+"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:441
msgid "<option>-u</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:441
msgid "<option>--show-upgraded</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:442
msgid ""
"Show upgraded packages; Print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>-V</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>--verbose-versions</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:448
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:453
+msgid "<option>--host-architecture</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:454
+msgid ""
+"This option controls the architecture packages are built for by <command>apt-"
+"get source --compile</command> and how cross-builddependencies are "
+"satisfied. By default is not set which means that the host architecture is "
+"the same as the build architecture (which is defined by <literal>APT::"
+"Architecture</literal>) Configuration Item: <literal>APT::Get::Host-"
+"Architecture</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:462
msgid "<option>-b</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:462
msgid "<option>--compile</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:463
msgid "<option>--build</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:464
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:468
msgid "<option>--ignore-hold</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:469
msgid ""
"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -3198,12 +3232,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:475
msgid "<option>--no-upgrade</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:450
+#: apt-get.8.xml:476
msgid ""
"Do not upgrade packages; When used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -3212,12 +3246,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:482
msgid "<option>--only-upgrade</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:483
msgid ""
"Do not install new packages; When used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -3226,12 +3260,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:489
msgid "<option>--force-yes</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:490
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -3241,12 +3275,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:497
msgid "<option>--print-uris</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:498
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -3259,12 +3293,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:508
msgid "<option>--purge</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:509
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -3273,24 +3307,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:516
msgid "<option>--reinstall</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:517
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:495
+#: apt-get.8.xml:521
msgid "<option>--list-cleanup</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:522
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -3301,17 +3335,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:505
+#: apt-get.8.xml:531
msgid "<option>--target-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:532
msgid "<option>--default-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:533
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -3325,12 +3359,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:546
msgid "<option>--trivial-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:522
+#: apt-get.8.xml:548
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -3339,24 +3373,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:554
msgid "<option>--no-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:555
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:534
+#: apt-get.8.xml:560
msgid "<option>--auto-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:561
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -3365,12 +3399,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:567
msgid "<option>--only-source</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:568
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -3382,22 +3416,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--diff-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--dsc-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--tar-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:553
+#: apt-get.8.xml:579
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3405,24 +3439,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:558
+#: apt-get.8.xml:584
msgid "<option>--arch-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:585
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:589
msgid "<option>--allow-unauthenticated</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:564
+#: apt-get.8.xml:590
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -3430,14 +3464,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:603
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:612
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3445,29 +3479,29 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:618
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:595
+#: apt-get.8.xml:621
msgid "ORIGINAL AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:596
+#: apt-get.8.xml:622
msgid "&apt-author.jgunthorpe;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:599
+#: apt-get.8.xml:625
msgid "CURRENT AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:601
+#: apt-get.8.xml:627
msgid "&apt-author.team;"
msgstr ""
@@ -3582,24 +3616,44 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:131
msgid ""
-"Update the local keyring with the keyring of Debian archive keys and removes "
-"from the keyring the archive keys which are no longer valid."
+"Update the local keyring with the archive keyring and remove from the local "
+"keyring the archive keys which are no longer valid. The archive keyring is "
+"shipped in the <literal>archive-keyring</literal> package of your "
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:141
+#, fuzzy
+msgid "net-update"
+msgstr "upgrade"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:145
+msgid ""
+"Work similar to the <command>update</command> command above, but get the "
+"archive keyring from an URI instead and validate it against a master key. "
+"This requires an installed &wget; and an APT build configured to have a "
+"server to fetch from and a master keyring to validate. APT in Debian does "
+"not support this command and relies on <command>update</command> instead, "
+"but Ubuntu's APT does."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:162
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:164
msgid "--keyring <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:165
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -3610,43 +3664,43 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:178
msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:180
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:181
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#: apt-key.8.xml:184
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
-msgid "Keyring of Debian archive trusted keys."
+#: apt-key.8.xml:185
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:188
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
-msgid "Keyring of Debian archive removed trusted keys."
+#: apt-key.8.xml:189
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:198
msgid "&apt-get;, &apt-secure;"
msgstr ""
@@ -3654,8 +3708,8 @@ msgstr ""
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -3674,20 +3728,21 @@ msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -3697,107 +3752,131 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+msgid "auto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
-msgid "showauto"
+#: apt-mark.8.xml:85
+msgid "hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:86
msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed. The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:96
msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
+#: apt-mark.8.xml:101
+msgid "showauto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:102
msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line. All automatically "
+"installed packages will be listed if no package is given. If packages are "
+"given only those which are automatically installed will be shown."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
+#: apt-mark.8.xml:109
+msgid "showmanual"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
+#: apt-mark.8.xml:116
+msgid "showhold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
+#: apt-mark.8.xml:117
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
+#: apt-mark.8.xml:130
+msgid ""
+"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
+#: apt-mark.8.xml:131
+msgid ""
+"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
+"option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
+#: apt-mark.8.xml:134
+msgid ""
+"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
+"filename> instead of the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
msgid " &file-extended_states;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -4134,11 +4213,12 @@ msgstr ""
#: apt.conf.5.xml:52
msgid ""
"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
-"order which have no or \"<literal>conf</literal>\" as filename extension and "
-"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
-"characters. Otherwise APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters. Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
msgstr ""
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
@@ -4310,13 +4390,24 @@ msgid ""
"compiled for."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:158
+msgid ""
+"All Architectures the system supports. Processors implementing the "
+"<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
+"<literal>i386</literal>; This list is use when fetching files and parsing "
+"package lists. The internal default is always the native architecture "
+"(<literal>APT::Architecture</literal>) and all foreign architectures it can "
+"retrieve by calling <command>dpkg --print-foreign-architectures</command>."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:165
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:166
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -4325,24 +4416,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:171
msgid "Ignore-Hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:164
+#: apt.conf.5.xml:172
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:176
msgid "Clean-Installed"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:177
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -4351,12 +4442,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:175
+#: apt.conf.5.xml:183
msgid "Immediate-Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:176
+#: apt.conf.5.xml:184
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -4389,12 +4480,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:198
+#: apt.conf.5.xml:206
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:207
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -4405,12 +4496,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:215
msgid "Cache-Start, Cache-Grow and Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
+#: apt.conf.5.xml:216
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
@@ -4430,63 +4521,63 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:223
+#: apt.conf.5.xml:231
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:232
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:235
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:236
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:240
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:241
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:245
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:238
+#: apt.conf.5.xml:246
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:244
+#: apt.conf.5.xml:252
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:249
+#: apt.conf.5.xml:257
msgid "Check-Valid-Until"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:250
+#: apt.conf.5.xml:258
msgid ""
"Security related option defaulting to true as an expiring validation for a "
"Release file prevents longtime replay attacks and can e.g. also help users "
@@ -4498,54 +4589,67 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:260
+#: apt.conf.5.xml:268
msgid "Max-ValidTime"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:261
+#: apt.conf.5.xml:269
+msgid ""
+"Seconds the Release file should be considered valid after it was created "
+"(indicated by the <literal>Date</literal> header). If the Release file "
+"itself includes a <literal>Valid-Until</literal> header the earlier date of "
+"the two is used as the expiration date. The default value is <literal>0</"
+"literal> which stands for \"for ever\". Archive specific settings can be "
+"made by appending the label of the archive to the option name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:279
+msgid "Min-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
msgid ""
-"Seconds the Release file should be considered valid after it was created. "
-"The default is \"for ever\" (0) if the Release file of the archive doesn't "
-"include a <literal>Valid-Until</literal> header. If it does then this date "
-"is the default. The date from the Release file or the date specified by the "
-"creation time of the Release file (<literal>Date</literal> header) plus the "
-"seconds specified with this options are used to check if the validation of a "
-"file has expired by using the earlier date of the two. Archive specific "
-"settings can be made by appending the label of the archive to the option "
-"name."
+"Minimum of seconds the Release file should be considered valid after it was "
+"created (indicated by the <literal>Date</literal> header). Use this if you "
+"need to use a seldomly updated (local) mirror of a more regular updated "
+"archive with a <literal>Valid-Until</literal> header instead of competely "
+"disabling the expiration date checking. Archive specific settings can and "
+"should be used by appending the label of the archive to the option name."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:290
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:274
+#: apt.conf.5.xml:291
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:294
msgid ""
"Two sub-options to limit the use of PDiffs are also available: With "
"<literal>FileLimit</literal> can be specified how many PDiff files are "
"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum precentage of the size of all patches compared to "
+"other hand is the maximum percentage of the size of all patches compared to "
"the size of the targeted file. If one of these limits is exceeded the "
"complete file is downloaded instead of the patches."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:303
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:304
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4555,36 +4659,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:311
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#: apt.conf.5.xml:312
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:299
+#: apt.conf.5.xml:316
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:300
+#: apt.conf.5.xml:317
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304 sources.list.5.xml:144
+#: apt.conf.5.xml:321 sources.list.5.xml:160
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:322
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4595,7 +4699,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#: apt.conf.5.xml:330
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4609,7 +4713,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323 apt.conf.5.xml:387
+#: apt.conf.5.xml:340 apt.conf.5.xml:404
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4617,7 +4721,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:343
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -4629,7 +4733,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:351
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -4639,7 +4743,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:339
+#: apt.conf.5.xml:356
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -4647,12 +4751,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:362
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:363
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4662,7 +4766,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:352
+#: apt.conf.5.xml:369
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4683,12 +4787,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:370 sources.list.5.xml:155
+#: apt.conf.5.xml:387 sources.list.5.xml:171
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:388
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4707,7 +4811,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:407
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -4717,7 +4821,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:414
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -4726,7 +4830,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:419
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4736,18 +4840,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:409 sources.list.5.xml:137
+#: apt.conf.5.xml:426 sources.list.5.xml:153
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:415
+#: apt.conf.5.xml:432
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#: apt.conf.5.xml:427
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4760,12 +4864,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:437
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:421
+#: apt.conf.5.xml:438
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4773,18 +4877,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:443
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:449
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:427
+#: apt.conf.5.xml:444
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4796,19 +4900,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:454
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:457
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:433
+#: apt.conf.5.xml:450
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -4825,20 +4929,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:461
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:442
+#: apt.conf.5.xml:459
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
"will only be used if this file exists, e.g. for the bzip2 method (the "
-"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
-"that list entries specified on the command line will be added at the end of "
-"the list specified in the configuration files, but before the default "
+"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+"also that list entries specified on the command line 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 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 "
@@ -4846,20 +4950,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:466
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
"uncompressed files so this is mostly only useable for local mirrors."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:454
+#: apt.conf.5.xml:471
msgid "GzipIndexes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:473
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4868,12 +4972,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:463
+#: apt.conf.5.xml:480
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:481
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
@@ -4886,13 +4990,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:480
+#: apt.conf.5.xml:497
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:487
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -4915,19 +5019,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:253
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:487
+#: apt.conf.5.xml:504
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:506
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4939,7 +5043,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:513
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4952,7 +5056,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:522
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4962,7 +5066,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:528
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -4970,7 +5074,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:532
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4981,7 +5085,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:540
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4994,7 +5098,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:553
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -5005,13 +5109,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:562
#, fuzzy
msgid "APT in DSelect"
msgstr "DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:564
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -5019,12 +5123,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:551
+#: apt.conf.5.xml:568
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:569
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5035,50 +5139,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:578
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:582
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:583
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:587
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:588
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:594
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:595
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:583
+#: apt.conf.5.xml:600
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -5086,17 +5190,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:606
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5105,12 +5209,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:612
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:613
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5120,7 +5224,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:619
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5130,36 +5234,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:626
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:627
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:631
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:615
+#: apt.conf.5.xml:632
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:637
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:638
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiple calls of dpkg. Without further options dpkg will use triggers only "
@@ -5174,7 +5278,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:653
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5184,7 +5288,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:647
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -5198,12 +5302,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:642
+#: apt.conf.5.xml:659
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:660
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -5215,12 +5319,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:650
+#: apt.conf.5.xml:667
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:668
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5236,12 +5340,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:678
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:662
+#: apt.conf.5.xml:679
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -5252,12 +5356,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:685
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:669
+#: apt.conf.5.xml:686
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5267,12 +5371,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:691
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:675
+#: apt.conf.5.xml:692
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-"
@@ -5284,12 +5388,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:699
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:707
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5301,7 +5405,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:700
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 "
@@ -5315,12 +5419,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:720
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:721
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5329,12 +5433,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:729
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:731
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5345,7 +5449,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:742
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5353,7 +5457,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:750
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5361,7 +5465,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:759
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5371,111 +5475,111 @@ 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:750
+#: apt.conf.5.xml:767
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:760
+#: apt.conf.5.xml:777
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:782
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:786
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:793
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:780
+#: apt.conf.5.xml:797
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:787
+#: apt.conf.5.xml:804
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:791
+#: apt.conf.5.xml:808
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:815
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:802
+#: apt.conf.5.xml:819
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:826
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:813
+#: apt.conf.5.xml:830
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:820
+#: apt.conf.5.xml:837
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:841
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:831
+#: apt.conf.5.xml:848
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:851
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:858
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:861
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:851
+#: apt.conf.5.xml:868
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:871
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 "
@@ -5483,93 +5587,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:879
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:882
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:873
+#: apt.conf.5.xml:890
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:894
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:884
+#: apt.conf.5.xml:901
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:904
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:894
+#: apt.conf.5.xml:911
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:897
+#: apt.conf.5.xml:914
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:905
+#: apt.conf.5.xml:922
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:926
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:916
+#: apt.conf.5.xml:933
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:937
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:927
+#: apt.conf.5.xml:944
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:948
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:938
+#: apt.conf.5.xml:955
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:958
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5579,12 +5683,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:969
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:955
+#: apt.conf.5.xml:972
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5601,91 +5705,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:991
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:994
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:984
+#: apt.conf.5.xml:1001
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:987
+#: apt.conf.5.xml:1004
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:995
+#: apt.conf.5.xml:1012
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:998
+#: apt.conf.5.xml:1015
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:1005
+#: apt.conf.5.xml:1022
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1009
+#: apt.conf.5.xml:1026
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:1017
+#: apt.conf.5.xml:1034
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1021
+#: apt.conf.5.xml:1038
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1028
+#: apt.conf.5.xml:1045
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1032
+#: apt.conf.5.xml:1049
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1055
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1042
+#: apt.conf.5.xml:1059
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:1050
+#: apt.conf.5.xml:1067
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1053
+#: apt.conf.5.xml:1070
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 "
@@ -5693,32 +5797,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1078
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1065
+#: apt.conf.5.xml:1082
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:1088
+#: apt.conf.5.xml:1105
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1112
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1100
+#: apt.conf.5.xml:1117
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
@@ -5790,8 +5894,8 @@ msgstr ""
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
-"following naming convention: The files have no or \"<literal>pref</literal>"
-"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
"that it has ignored a file if the file doesn't match a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@ -6109,82 +6213,133 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, no-wrap
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+msgid "Package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:314
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:315
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:319
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:325
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:326
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:288
+#: apt_preferences.5.xml:331
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:332
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:337
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:338
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:342
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:343
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:309
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6192,7 +6347,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:348
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6201,14 +6356,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:354
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:358
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6225,12 +6380,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:371
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:373
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6240,7 +6395,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:378
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6248,7 +6403,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:382
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6257,12 +6412,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:392
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:394
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6270,27 +6425,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:406
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:364
+#: apt_preferences.5.xml:407
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:411
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:398
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6303,12 +6458,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:427
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:428
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6319,18 +6474,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:438
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:444
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:445
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6341,13 +6496,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:454
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:461
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -6357,7 +6512,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:470
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6366,12 +6521,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:479
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:480
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6382,18 +6537,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:446
+#: apt_preferences.5.xml:489
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:452
+#: apt_preferences.5.xml:495
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:453
+#: apt_preferences.5.xml:496
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6402,18 +6557,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:459
+#: apt_preferences.5.xml:502
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:465
+#: apt_preferences.5.xml:508
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:509
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6422,13 +6577,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:515
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:416
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6442,7 +6597,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:522
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6457,12 +6612,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:535
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:494
+#: apt_preferences.5.xml:537
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6470,12 +6625,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:503
+#: apt_preferences.5.xml:546
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:554
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6490,7 +6645,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6500,8 +6655,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6510,7 +6665,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:566
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6519,13 +6674,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:583
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:577
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6534,12 +6689,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:589
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:555
+#: apt_preferences.5.xml:598
#, no-wrap
msgid ""
"Package: *\n"
@@ -6556,7 +6711,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:591
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6567,7 +6722,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:612
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6576,13 +6731,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:632
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:623
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6594,12 +6749,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:596
+#: apt_preferences.5.xml:639
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:610
+#: apt_preferences.5.xml:653
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6619,7 +6774,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:641
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6634,7 +6789,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:670
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6643,13 +6798,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:647
+#: apt_preferences.5.xml:690
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:681
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6661,12 +6816,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:699
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:662
+#: apt_preferences.5.xml:705
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
@@ -6750,7 +6905,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:81
#, no-wrap
-msgid "deb uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri distribution [component1] [component2] [...]"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -6795,6 +6950,38 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:112
msgid ""
+"<literal>options</literal> is always optional and needs to be surounded by "
+"square brackets. It can consist of multiple settings in the form "
+"<literal><replaceable>setting</replaceable>=<replaceable>value</"
+"replaceable></literal>. Multiple settings are separated by spaces. The "
+"following settings are supported by APT, note through that unsupported "
+"settings will be ignored silently:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:117
+msgid ""
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> can be used to specify for which architectures "
+"packages information should be downloaded. If this option is not set all "
+"architectures defined by the <literal>APT::Architectures</literal> option "
+"will be downloaded."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:128
+msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@ -6802,12 +6989,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:133
msgid "Some examples:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:119
+#: sources.list.5.xml:135
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6816,17 +7003,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:125
+#: sources.list.5.xml:141
msgid "URI specification"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:146
msgid "file"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:132
+#: sources.list.5.xml:148
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6834,14 +7021,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:155
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:162
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6852,7 +7039,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:173
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6864,12 +7051,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:182
msgid "copy"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:184
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6877,17 +7064,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "rsh"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "ssh"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:191
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -6897,12 +7084,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:199
msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:185
+#: sources.list.5.xml:201
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
@@ -6915,75 +7102,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:143
msgid ""
"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:215
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:203
+#: sources.list.5.xml:219
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:220
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:222
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:223
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:209
+#: sources.list.5.xml:225
+msgid ""
+"The first line gets package information for the architectures in "
+"<literal>APT::Architectures</literal> while the second always retrieves "
+"<literal>amd64</literal> and <literal>armel</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:227
+#, no-wrap
+msgid ""
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:230
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:211
+#: sources.list.5.xml:232
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:234
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:236
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:238
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -6992,19 +7195,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:251
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:244
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7016,7 +7219,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:256
msgid "&apt-cache; &apt-conf;"
msgstr ""
diff --git a/doc/po/ja.po b/doc/po/ja.po
index d0d2ef275..4152e01f3 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2011-04-05 10:22+0300\n"
+"POT-Creation-Date: 2011-11-10 16:42+0100\n"
"PO-Revision-Date: 2010-09-07 07:38+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -791,8 +791,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
msgid "Description"
@@ -814,7 +814,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:120
+#: apt-cache.8.xml:70 apt-get.8.xml:127
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -1329,8 +1329,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
+#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
msgid "options"
msgstr "オプション"
@@ -1357,7 +1357,7 @@ msgstr ""
"pkgcache</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
#: apt-sortpkgs.1.xml:61
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1384,12 +1384,12 @@ msgstr ""
"<literal>Dir::Cache::srcpkgcache</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1475,7 +1475,7 @@ msgstr "<option>--no-enhances</option>"
#, fuzzy
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be twicked with these flags which will omit "
+"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
"Cache::ShowRecommends</literal>."
@@ -1485,7 +1485,7 @@ msgstr ""
"RecurseDepends</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
+#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
msgid "<option>-f</option>"
msgstr "<option>-f</option>"
@@ -1505,7 +1505,8 @@ msgstr ""
"ShowFull</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+#: apt-get.8.xml:452
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -1627,15 +1628,15 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:596
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
+#: apt-cache.8.xml:372 apt-get.8.xml:601 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt.conf.5.xml:1110 apt_preferences.5.xml:697
msgid "Files"
msgstr "ファイル"
@@ -1647,10 +1648,10 @@ msgstr "&file-sourceslist; &file-statelists;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
-#: sources.list.5.xml:234
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:611
+#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
msgid "See Also"
msgstr "関連項目"
@@ -1663,8 +1664,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:617
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "診断メッセージ"
@@ -1800,12 +1801,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:161
msgid "Options"
msgstr "オプション"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -1849,7 +1850,7 @@ msgstr ""
"ã¾ã™ã€‚設定項目 - <literal>APT::CDROM::Rename</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:364
+#: apt-cdrom.8.xml:116 apt-get.8.xml:375
msgid "<option>-m</option>"
msgstr "<option>-m</option>"
@@ -1908,17 +1909,17 @@ msgstr ""
"ã§ãã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:395
+#: apt-cdrom.8.xml:143 apt-get.8.xml:406
msgid "<option>--just-print</option>"
msgstr "<option>--just-print</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:397
+#: apt-cdrom.8.xml:144 apt-get.8.xml:408
msgid "<option>--recon</option>"
msgstr "<option>--recon</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:398
+#: apt-cdrom.8.xml:145 apt-get.8.xml:409
msgid "<option>--no-act</option>"
msgstr "<option>--no-act</option>"
@@ -2075,7 +2076,7 @@ msgstr "設定箇所ã®å†…容を表示ã™ã‚‹ã ã‘ã§ã™ã€‚"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
#: apt-sortpkgs.1.xml:73
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2159,7 +2160,7 @@ msgstr ""
"<filename>package.config.XXXX</filename> ã¨è¨€ã£ãŸå½¢ã«ãªã‚Šã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
+#: apt-extracttemplates.1.xml:63 apt-get.8.xml:530
msgid "<option>-t</option>"
msgstr "<option>-t</option>"
@@ -2439,7 +2440,7 @@ msgstr ""
"ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã‚‰ä½œæˆã™ã‚‹ã‹ã‚’指定ã™ã‚‹ã€æŸ”軟ãªæ–¹æ³•ã‚’æä¾›ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:287
+#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
msgid "clean"
msgstr "clean"
@@ -3041,8 +3042,8 @@ msgstr ""
"<literal>main contrib non-free</literal>ã®ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚"
# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
msgid "Architectures"
msgstr "Architectures"
@@ -3308,10 +3309,10 @@ msgid ""
"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
"replaceable>::<replaceable>Checksum</replaceable></literal> where "
-"<literal>Index</literal> can be <literal>Packages</literal>, "
-"<literal>Sources</literal> or <literal>Release</literal> and "
-"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
-"literal> or <literal>SHA256</literal>."
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
msgstr ""
"Release ファイルã®è¿½åŠ ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã®å€¤ã¯ã€<literal>APT::FTPArchive::"
"Release</literal> 以下ã®ç›¸å½“ã™ã‚‹å€¤ (例: <literal>APT::FTPArchive::Release::"
@@ -3322,13 +3323,13 @@ msgstr ""
"<literal>Components</literal>, <literal>Description</literal> ã§ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:539
+#: apt-ftparchive.1.xml:540
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3338,7 +3339,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:547
+#: apt-ftparchive.1.xml:548
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3351,13 +3352,13 @@ msgstr ""
"<literal>quiet</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:556
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3370,13 +3371,13 @@ msgstr ""
"<literal>APT::FTPArchive::DeLinkAct</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3391,13 +3392,13 @@ msgstr ""
"<literal>APT::FTPArchive::Contents</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:571
+#: apt-ftparchive.1.xml:572
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3407,13 +3408,13 @@ msgstr ""
"é¸æŠžã—ã¾ã™ã€‚設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:578
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:580
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3422,13 +3423,13 @@ msgstr ""
"FTPArchive::ReadOnlyDB</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:584
msgid "<option>--arch</option>"
msgstr "<option>--arch</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:585
#, fuzzy
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
@@ -3442,12 +3443,12 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:590
+#: apt-ftparchive.1.xml:591
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3461,12 +3462,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:602
+#: apt-ftparchive.1.xml:603
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:605
#, fuzzy
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
@@ -3482,14 +3483,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
-#: sources.list.5.xml:198
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
msgid "Examples"
msgstr "サンプル"
# type: Content of: <refentry><refsect1><para><programlisting>
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
@@ -3498,7 +3499,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:618
+#: apt-ftparchive.1.xml:619
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3508,7 +3509,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:632
+#: apt-ftparchive.1.xml:633
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3540,15 +3541,45 @@ msgstr "APT パッケージæ“作ユーティリティ -- コマンドラインã
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-get.8.xml:39
+#, fuzzy
+#| msgid ""
+#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
+#| "<arg> <option>-t=</option> <arg choice='plain'> "
+#| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+#| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+#| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
+#| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#| "<group choice='req'> <arg choice='plain'> "
+#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#| "help</arg> </group> </arg> </group>"
msgid ""
"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <group choice=\"req\"> <arg "
-"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
-"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
-"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
+"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
+"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
+"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
+"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
+"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
@@ -3596,7 +3627,7 @@ msgstr ""
"</group> </arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:115
+#: apt-get.8.xml:122
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
@@ -3609,13 +3640,13 @@ msgstr ""
"&wajig; ãªã©ãŒã‚ã‚Šã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:124 apt-key.8.xml:127
+#: apt-get.8.xml:131 apt-key.8.xml:127
msgid "update"
msgstr "update"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:132
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources. The indexes of available packages are fetched from the "
@@ -3638,13 +3669,13 @@ msgstr ""
# type: <tag></tag>
#. type: <tag></tag>
-#: apt-get.8.xml:136 guide.sgml:121
+#: apt-get.8.xml:143 guide.sgml:121
msgid "upgrade"
msgstr "upgrade"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:137
+#: apt-get.8.xml:144
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -3668,13 +3699,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:149
+#: apt-get.8.xml:156
msgid "dselect-upgrade"
msgstr "dselect-upgrade"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:150
+#: apt-get.8.xml:157
msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3692,13 +3723,13 @@ msgstr ""
# type: <tag></tag>
#. type: <tag></tag>
-#: apt-get.8.xml:159 guide.sgml:140
+#: apt-get.8.xml:166 guide.sgml:140
msgid "dist-upgrade"
msgstr "dist-upgrade"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:167
msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3722,13 +3753,13 @@ msgstr ""
# type: <tag></tag>
#. type: <tag></tag>
-#: apt-get.8.xml:172 guide.sgml:131
+#: apt-get.8.xml:179 guide.sgml:131
msgid "install"
msgstr "install"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:181
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
@@ -3755,7 +3786,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:199
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -3773,7 +3804,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:206
msgid ""
"Both of the version selection mechanisms can downgrade packages and must be "
"used with care."
@@ -3782,7 +3813,7 @@ msgstr ""
"ãªã‚Šã¾ã›ã‚“。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:202
+#: apt-get.8.xml:209
msgid ""
"This is also the target to use if you want to upgrade one or more already-"
"installed packages without upgrading every package you have on your system. "
@@ -3802,7 +3833,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:220
msgid ""
"Finally, the &apt-preferences; mechanism allows you to create an alternative "
"installation policy for individual packages."
@@ -3812,7 +3843,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:224
msgid ""
"If no package matches the given expression and the expression contains one "
"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3829,13 +3860,13 @@ msgstr ""
"ã°ã€'^' ã‚„ '$' を付ã‘ã‚‹ã‹ã€ã‚‚ã£ã¨è©³ã—ã„æ­£è¦è¡¨ç¾ã‚’指定ã—ã¦ãã ã•ã„。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:233
msgid "remove"
msgstr "remove"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:227
+#: apt-get.8.xml:234
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note the removing a package "
@@ -3850,13 +3881,13 @@ msgstr ""
"トールã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:241
msgid "purge"
msgstr "purge"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:235
+#: apt-get.8.xml:242
msgid ""
"<literal>purge</literal> is identical to <literal>remove</literal> except "
"that packages are removed and purged (any configuration files are deleted "
@@ -3867,13 +3898,13 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:246
msgid "source"
msgstr "source"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:240
+#: apt-get.8.xml:247
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -3892,7 +3923,7 @@ msgstr ""
"literal> 構文ã§æŒ‡å®šã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:248
+#: apt-get.8.xml:255
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
"src</literal> type lines in the &sources-list; file. This means that you "
@@ -3907,12 +3938,19 @@ msgstr ""
"ã‚‚ã£ã¨é©åˆ‡ãªã‚‚ã®ã‚’å–å¾—ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:262
+#, fuzzy
+#| msgid ""
+#| "If the <option>--compile</option> option is specified then the package "
+#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+#| "command>, if <option>--download-only</option> is specified then the "
+#| "source package will not be unpacked."
msgid ""
"If the <option>--compile</option> option is specified then the package will "
-"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
-"<option>--download-only</option> is specified then the source package will "
-"not be unpacked."
+"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+"the architecture as defined by the <command>--host-architecture</command> "
+"option. If <option>--download-only</option> is specified then the source "
+"package will not be unpacked."
msgstr ""
"<option>--compile</option> オプションを指定ã™ã‚‹ã¨ã€<command>dpkg-"
"buildpackage</command> を用ã„ã¦ãƒã‚¤ãƒŠãƒª .deb パッケージをコンパイルã—ã¾ã™ã€‚"
@@ -3921,7 +3959,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:260
+#: apt-get.8.xml:269
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -3936,7 +3974,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:275
msgid ""
"Note that source packages are not tracked like binary packages, they exist "
"only in the current directory and are similar to downloading source tar "
@@ -3946,28 +3984,35 @@ msgstr ""
"展開ã•ã‚Œã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:280
msgid "build-dep"
msgstr "build-dep"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:281
+#, fuzzy
+#| msgid ""
+#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+#| "an attempt to satisfy the build dependencies for a source package."
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
-"attempt to satisfy the build dependencies for a source package."
+"attempt to satisfy the build dependencies for a source package. By default "
+"the dependencies are satisfied to build the package nativly. If desired a "
+"host-architecture can be specified with the <option>--host-architecture</"
+"option> option instead."
msgstr ""
"<literal>build-dep</literal> ã¯ã€ã‚½ãƒ¼ã‚¹ãƒ‘ッケージã®æ§‹ç¯‰ä¾å­˜é–¢ä¿‚を満ãŸã™ã‚ˆã†"
"ã«ã€ãƒ‘ッケージã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãƒ»å‰Šé™¤ã‚’è¡Œã„ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:276
+#: apt-get.8.xml:287
msgid "check"
msgstr "check"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:288
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
@@ -3976,20 +4021,20 @@ msgstr ""
"ãƒã‚§ãƒƒã‚¯ã™ã‚‹è¨ºæ–­ãƒ„ールã§ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:292
msgid "download"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:293
msgid ""
"<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:299
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -4007,13 +4052,13 @@ msgstr ""
"<literal>apt-get clean</literal> を実行ã—ãŸããªã‚‹ã§ã—ょã†ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid "autoclean"
msgstr "autoclean"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:298
+#: apt-get.8.xml:309
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -4032,28 +4077,33 @@ msgstr ""
"防ã’ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:307
+#: apt-get.8.xml:318
msgid "autoremove"
msgstr "autoremove"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:319
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for some package and that "
+#| "are no more needed."
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for some package and that "
-"are no more needed."
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
msgstr ""
"<literal>autoremove</literal> ã¯ã€ä¾å­˜é–¢ä¿‚を満ãŸã™ãŸã‚ã«è‡ªå‹•çš„ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«"
"ã•ã‚Œã€ã‚‚ã†å¿…è¦ãªããªã£ãŸãƒ‘ッケージを削除ã™ã‚‹ã®ã«ä½¿ç”¨ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:323
msgid "changelog"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:324
msgid ""
"<literal>changelog</literal> downloads a package changelog and displays it "
"through <command>sensible-pager</command>. The server name and base "
@@ -4066,13 +4116,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:335
+#: apt-get.8.xml:346
msgid "<option>--no-install-recommends</option>"
msgstr "<option>--no-install-recommends</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:336
+#: apt-get.8.xml:347
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -4081,7 +4131,7 @@ msgstr ""
"<literal>APT::Install-Recommends</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:340
+#: apt-get.8.xml:351
#, fuzzy
#| msgid "<option>--no-suggests</option>"
msgid "<option>--install-suggests</option>"
@@ -4089,7 +4139,7 @@ msgstr "<option>--no-suggests</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:341
+#: apt-get.8.xml:352
#, fuzzy
#| msgid ""
#| "Do not consider recommended packages as a dependency for installing. "
@@ -4102,13 +4152,13 @@ msgstr ""
"<literal>APT::Install-Recommends</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:356
msgid "<option>--download-only</option>"
msgstr "<option>--download-only</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:357
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -4117,13 +4167,13 @@ msgstr ""
"ã„ã¾ã›ã‚“。設定項目 - <literal>APT::Get::Download-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:350
+#: apt-get.8.xml:361
msgid "<option>--fix-broken</option>"
msgstr "<option>--fix-broken</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:362
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -4149,18 +4199,18 @@ msgstr ""
"<literal>APT::Get::Fix-Broken</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:375
msgid "<option>--ignore-missing</option>"
msgstr "<option>--ignore-missing</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:365
+#: apt-get.8.xml:376
msgid "<option>--fix-missing</option>"
msgstr "<option>--fix-missing</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:366
+#: apt-get.8.xml:377
msgid ""
"Ignore missing packages; If packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -4179,13 +4229,13 @@ msgstr ""
"Get::Fix-Missing</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:387
msgid "<option>--no-download</option>"
msgstr "<option>--no-download</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:388
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -4197,7 +4247,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:384
+#: apt-get.8.xml:395
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4216,18 +4266,18 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:405
msgid "<option>--simulate</option>"
msgstr "<option>--simulate</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:407
msgid "<option>--dry-run</option>"
msgstr "<option>--dry-run</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:410
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -4237,7 +4287,7 @@ msgstr ""
"è¡Œã„ã¾ã›ã‚“。設定項目 - <literal>APT::Get::Simulate</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:414
msgid ""
"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
"literal>) automatic. Also a notice will be displayed indicating that this "
@@ -4255,7 +4305,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:420
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4267,23 +4317,23 @@ msgstr ""
"空ã®è§’カッコã¯å¤§ã—ãŸå•é¡Œã§ã¯ãªã„ã“ã¨ã‚’表ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>-y</option>"
msgstr "<option>-y</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>--yes</option>"
msgstr "<option>--yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:417
+#: apt-get.8.xml:428
msgid "<option>--assume-yes</option>"
msgstr "<option>--assume-yes</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:418
+#: apt-get.8.xml:429
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -4297,18 +4347,39 @@ msgstr ""
"定項目 - <literal>APT::Get::Assume-Yes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:436
+#, fuzzy
+#| msgid "<option>--assume-yes</option>"
+msgid "<option>--assume-no</option>"
+msgstr "<option>--assume-yes</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:437
+#, fuzzy
+#| msgid ""
+#| "Compile source packages after downloading them. Configuration Item: "
+#| "<literal>APT::Get::Compile</literal>."
+msgid ""
+"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+"ソースパッケージをダウンロード後ã€ã‚³ãƒ³ãƒ‘イルã—ã¾ã™ã€‚設定項目 - <literal>APT::"
+"Get::Compile</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:441
msgid "<option>-u</option>"
msgstr "<option>-u</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:441
msgid "<option>--show-upgraded</option>"
msgstr "<option>--show-upgraded</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:442
msgid ""
"Show upgraded packages; Print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4317,18 +4388,18 @@ msgstr ""
"<literal>APT::Get::Show-Upgraded</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>-V</option>"
msgstr "<option>-V</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>--verbose-versions</option>"
msgstr "<option>--verbose-versions</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:448
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -4337,23 +4408,41 @@ msgstr ""
"<literal>APT::Get::Show-Versions</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:453
+#, fuzzy
+#| msgid "<option>--recurse</option>"
+msgid "<option>--host-architecture</option>"
+msgstr "<option>--recurse</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:454
+msgid ""
+"This option controls the architecture packages are built for by <command>apt-"
+"get source --compile</command> and how cross-builddependencies are "
+"satisfied. By default is not set which means that the host architecture is "
+"the same as the build architecture (which is defined by <literal>APT::"
+"Architecture</literal>) Configuration Item: <literal>APT::Get::Host-"
+"Architecture</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:462
msgid "<option>-b</option>"
msgstr "<option>-b</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:462
msgid "<option>--compile</option>"
msgstr "<option>--compile</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:463
msgid "<option>--build</option>"
msgstr "<option>--build</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:464
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -4362,13 +4451,13 @@ msgstr ""
"Get::Compile</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:468
msgid "<option>--ignore-hold</option>"
msgstr "<option>--ignore-hold</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:469
msgid ""
"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -4381,13 +4470,13 @@ msgstr ""
"Hold</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:475
msgid "<option>--no-upgrade</option>"
msgstr "<option>--no-upgrade</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:450
+#: apt-get.8.xml:476
msgid ""
"Do not upgrade packages; When used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4399,12 +4488,12 @@ msgstr ""
"ã‚ã‚‹å ´åˆã«æ›´æ–°ã‚’è¡Œã„ã¾ã›ã‚“。設定項目 - <literal>APT::Get::Upgrade</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:482
msgid "<option>--only-upgrade</option>"
msgstr "<option>--only-upgrade</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:483
#, fuzzy
msgid ""
"Do not install new packages; When used in conjunction with <literal>install</"
@@ -4417,13 +4506,13 @@ msgstr ""
"ã‚ã‚‹å ´åˆã«æ›´æ–°ã‚’è¡Œã„ã¾ã›ã‚“。設定項目 - <literal>APT::Get::Upgrade</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:489
msgid "<option>--force-yes</option>"
msgstr "<option>--force-yes</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:490
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -4437,13 +4526,13 @@ msgstr ""
"ã­ã¾ã›ã‚“! 設定項目 - <literal>APT::Get::force-yes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:497
msgid "<option>--print-uris</option>"
msgstr "<option>--print-uris</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:498
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -4464,13 +4553,13 @@ msgstr ""
"Print-URIs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:508
msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:509
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4483,13 +4572,13 @@ msgstr ""
"<literal>APT::Get::Purge</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:516
msgid "<option>--reinstall</option>"
msgstr "<option>--reinstall</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:517
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4498,13 +4587,13 @@ msgstr ""
"定項目 - <literal>APT::Get::ReInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:495
+#: apt-get.8.xml:521
msgid "<option>--list-cleanup</option>"
msgstr "<option>--list-cleanup</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:522
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -4520,18 +4609,18 @@ msgstr ""
"ã™ã‚‹æ™‚ãらã„ã§ã—ょã†ã€‚設定項目 - <literal>APT::Get::List-Cleanup</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:505
+#: apt-get.8.xml:531
msgid "<option>--target-release</option>"
msgstr "<option>--target-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:532
msgid "<option>--default-release</option>"
msgstr "<option>--default-release</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:533
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -4553,13 +4642,13 @@ msgstr ""
"Release</literal>。&apt-preferences; ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚‚ã”覧ãã ã•ã„。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:546
msgid "<option>--trivial-only</option>"
msgstr "<option>--trivial-only</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:522
+#: apt-get.8.xml:548
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4572,13 +4661,13 @@ msgstr ""
"ç›® - <literal>APT::Get::Trivial-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:554
msgid "<option>--no-remove</option>"
msgstr "<option>--no-remove</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:555
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4587,13 +4676,13 @@ msgstr ""
"é …ç›® - <literal>APT::Get::Remove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:534
+#: apt-get.8.xml:560
msgid "<option>--auto-remove</option>"
msgstr "<option>--auto-remove</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:561
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4606,13 +4695,13 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:567
msgid "<option>--only-source</option>"
msgstr "<option>--only-source</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:568
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -4630,23 +4719,23 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--diff-only</option>"
msgstr "<option>--diff-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--dsc-only</option>"
msgstr "<option>--dsc-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--tar-only</option>"
msgstr "<option>--tar-only</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:553
+#: apt-get.8.xml:579
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4657,13 +4746,13 @@ msgstr ""
"Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:558
+#: apt-get.8.xml:584
msgid "<option>--arch-only</option>"
msgstr "<option>--arch-only</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:585
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -4672,13 +4761,13 @@ msgstr ""
"<literal>APT::Get::Arch-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:589
msgid "<option>--allow-unauthenticated</option>"
msgstr "<option>--allow-unauthenticated</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:564
+#: apt-get.8.xml:590
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -4689,7 +4778,7 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:603
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
@@ -4699,7 +4788,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:612
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4711,7 +4800,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:618
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -4720,22 +4809,22 @@ msgstr ""
"100 ã‚’è¿”ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:595
+#: apt-get.8.xml:621
msgid "ORIGINAL AUTHORS"
msgstr "原著者"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:596
+#: apt-get.8.xml:622
msgid "&apt-author.jgunthorpe;"
msgstr "&apt-author.jgunthorpe;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:599
+#: apt-get.8.xml:625
msgid "CURRENT AUTHORS"
msgstr "ç¾è‘—者"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:601
+#: apt-get.8.xml:627
msgid "&apt-author.team;"
msgstr "&apt-author.team;"
@@ -4874,18 +4963,36 @@ msgstr ""
"gpg ã«ä¸Šç´šã‚ªãƒ—ションを渡ã—ã¾ã™ã€‚adv --recv-key ã¨ã™ã‚‹ã¨ã€å…¬é–‹éµã‚’ダウンロード"
"ã§ãã¾ã™ã€‚"
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:131
msgid ""
-"Update the local keyring with the keyring of Debian archive keys and removes "
-"from the keyring the archive keys which are no longer valid."
+"Update the local keyring with the archive keyring and remove from the local "
+"keyring the archive keys which are no longer valid. The archive keyring is "
+"shipped in the <literal>archive-keyring</literal> package of your "
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:141
+#, fuzzy
+#| msgid "update"
+msgid "net-update"
+msgstr "update"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:145
+msgid ""
+"Work similar to the <command>update</command> command above, but get the "
+"archive keyring from an URI instead and validate it against a master key. "
+"This requires an installed &wget; and an APT build configured to have a "
+"server to fetch from and a master keyring to validate. APT in Debian does "
+"not support this command and relies on <command>update</command> instead, "
+"but Ubuntu's APT does."
msgstr ""
-"Debian アーカイブキーã§ã€ãƒ­ãƒ¼ã‚«ãƒ«ã‚­ãƒ¼ãƒªãƒ³ã‚°ã‚’æ›´æ–°ã—ã€ã‚‚ã†æœ‰åŠ¹ã§ãªã„キーをキー"
-"リングã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:162
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
@@ -4895,12 +5002,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:164
msgid "--keyring <replaceable>filename</replaceable>"
msgstr "--keyring <replaceable>filename</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:165
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -4916,58 +5023,71 @@ msgstr ""
"加ã•ã‚Œã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:178
msgid "&file-trustedgpg;"
msgstr "&file-trustedgpg;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:180
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:181
msgid "Local trust database of archive keys."
msgstr "アーカイブキーã®ãƒ­ãƒ¼ã‚«ãƒ«ä¿¡é ¼ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã§ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#: apt-key.8.xml:184
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
-msgid "Keyring of Debian archive trusted keys."
+#: apt-key.8.xml:185
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Debian アーカイブ信頼キーã®ã‚­ãƒ¼ãƒªãƒ³ã‚°ã§ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:188
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
-msgid "Keyring of Debian archive removed trusted keys."
+#: apt-key.8.xml:189
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "削除ã•ã‚ŒãŸ Debian アーカイブ信頼キーã®ã‚­ãƒ¼ãƒªãƒ³ã‚°ã§ã™ã€‚"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:198
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
+#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+#| "August 2009</date>"
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
msgstr ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
"August 2009</date>"
@@ -4987,13 +5107,22 @@ msgstr "パッケージãŒè‡ªå‹•çš„ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚ŒãŸã‹ã©ã†ã‹ã®
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:39
+#, fuzzy
+#| msgid ""
+#| " <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
+#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
msgstr ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
@@ -5004,7 +5133,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
@@ -5014,7 +5143,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -5029,15 +5158,22 @@ msgstr ""
"command> ã‚„ <command>aptitude</command> ã«ã‚ˆã‚Šå‰Šé™¤ã•ã‚Œã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+#, fuzzy
+#| msgid "markauto"
+msgid "auto"
msgstr "markauto"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
+#, fuzzy
+#| msgid ""
+#| "<literal>markauto</literal> is used to mark a package as being "
+#| "automatically installed, which will cause the package to be removed when "
+#| "no more manually installed packages depend on this package."
msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
@@ -5046,15 +5182,20 @@ msgstr ""
"ãªããªã‚‹ã¨ã€ã“ã®ãƒ‘ッケージを削除ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
-msgstr "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
+msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
+#, fuzzy
+#| msgid ""
+#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
@@ -5063,29 +5204,105 @@ msgstr ""
"ケージを自動的ã«å‰Šé™¤ã™ã‚‹ã®ã‚’防ãŽã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
+#: apt-mark.8.xml:85
+msgid "hold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:86
+msgid ""
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed. The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:96
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>showauto</literal> ã¯ã€è‡ªå‹•çš„ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚ŒãŸãƒ‘ッケージをã€ãƒ‘ッ"
+"ケージã”ã¨ã«æ”¹è¡Œã—ã¦è¡¨ç¤ºã—ã¾ã™ã€‚"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:101
msgid "showauto"
msgstr "showauto"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"installed packages with each package on a new line. All automatically "
+"installed packages will be listed if no package is given. If packages are "
+"given only those which are automatically installed will be shown."
msgstr ""
"<literal>showauto</literal> ã¯ã€è‡ªå‹•çš„ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚ŒãŸãƒ‘ッケージをã€ãƒ‘ッ"
"ケージã”ã¨ã«æ”¹è¡Œã—ã¦è¡¨ç¤ºã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:109
+#, fuzzy
+#| msgid "showauto"
+msgid "showmanual"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:116
+#, fuzzy
+#| msgid "showauto"
+msgid "showhold"
+msgstr "showauto"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:117
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showauto</literal> ã¯ã€è‡ªå‹•çš„ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚ŒãŸãƒ‘ッケージをã€ãƒ‘ッ"
+"ケージã”ã¨ã«æ”¹è¡Œã—ã¦è¡¨ç¤ºã—ã¾ã™ã€‚"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:130
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:131
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -5095,7 +5312,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:134
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -5106,52 +5323,20 @@ msgstr ""
"トリ㮠<filename>extended_status</filename>) ã«ä»£ãˆã¦ã€<filename>FILENAME</"
"filename> ã‹ã‚‰ãƒ‘ッケージã®çµ±è¨ˆã‚’読ã¿æ›¸ãã—ã¾ã™ã€‚"
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
-msgstr "<option>-h</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
-msgstr "<option>--help</option>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
-msgstr "短ã„使用方法を表示ã—ã¾ã™ã€‚"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
-msgstr "<option>-v</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
-msgstr "<option>--version</option>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
-msgstr "プログラムã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報を表示ã—ã¾ã™"
-
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
msgid " &file-extended_states;"
msgstr " &file-extended_states;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-get;,&aptitude;,&apt-conf;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -5645,11 +5830,12 @@ msgstr "<envar>APT_CONFIG</envar> 環境変数ã§æŒ‡å®šã—ãŸãƒ•ã‚¡ã‚¤ãƒ« (å­˜åœ
#| "period (.) characters - otherwise they will be silently ignored."
msgid ""
"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
-"order which have no or \"<literal>conf</literal>\" as filename extension and "
-"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
-"characters. Otherwise APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters. Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
msgstr ""
"<literal>Dir::Etc::Parts</literal> ã«ã‚ã‚‹ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’英数字ã®æ˜‡é †ã«ã€‚"
"ファイルåã«ã¯æ‹¡å¼µå­ãŒãªã„ã‹ã€\"<literal>conf</literal>\" ã¨ãªã£ã¦ãŠã‚Šã€è‹±æ•°"
@@ -5904,14 +6090,25 @@ msgstr ""
"ã«ä½¿ç”¨ã™ã‚‹ã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒãƒ£ã‚’セットã—ã¾ã™ã€‚内部ã§ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯ã€apt をコンパイ"
"ルã—ãŸã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒãƒ£ã§ã™ã€‚"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:158
+msgid ""
+"All Architectures the system supports. Processors implementing the "
+"<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
+"<literal>i386</literal>; This list is use when fetching files and parsing "
+"package lists. The internal default is always the native architecture "
+"(<literal>APT::Architecture</literal>) and all foreign architectures it can "
+"retrieve by calling <command>dpkg --print-foreign-architectures</command>."
+msgstr ""
+
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:165
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:166
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5924,13 +6121,13 @@ msgstr ""
"'4.0', '5.0*' ã¨ãªã‚Šã¾ã™ã€‚&apt-preferences; ã‚‚å‚ç…§ã—ã¦ãã ã•ã„。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:171
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:164
+#: apt.conf.5.xml:172
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -5940,13 +6137,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:176
msgid "Clean-Installed"
msgstr "Clean-Installed"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:177
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -5961,12 +6158,12 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:175
+#: apt.conf.5.xml:183
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:176
+#: apt.conf.5.xml:184
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -6022,13 +6219,13 @@ msgstr ""
"レãƒãƒ¼ãƒˆã‚’ãŠã­ãŒã„ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:198
+#: apt.conf.5.xml:206
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:207
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6046,12 +6243,12 @@ msgstr ""
"ä¸å¯æ¬ ãƒ‘ッケージã§å‹•ä½œã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:215
msgid "Cache-Start, Cache-Grow and Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
+#: apt.conf.5.xml:216
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
@@ -6071,24 +6268,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:223
+#: apt.conf.5.xml:231
msgid "Build-Essential"
msgstr "Build-Essential"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:232
msgid "Defines which package(s) are considered essential build dependencies."
msgstr "構築ä¾å­˜é–¢ä¿‚ã§ä¸å¯æ¬ ãªãƒ‘ッケージを定義ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:235
msgid "Get"
msgstr "Get"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:236
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -6097,13 +6294,13 @@ msgstr ""
"&apt-get; ã®æ–‡æ›¸ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:240
msgid "Cache"
msgstr "Cache"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:241
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -6112,13 +6309,13 @@ msgstr ""
"㯠&apt-cache; ã®æ–‡æ›¸ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:245
msgid "CDROM"
msgstr "CDROM"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:238
+#: apt.conf.5.xml:246
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -6128,17 +6325,17 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:244
+#: apt.conf.5.xml:252
msgid "The Acquire Group"
msgstr "Acquire グループ"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:249
+#: apt.conf.5.xml:257
msgid "Check-Valid-Until"
msgstr "Check-Valid-Until"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:250
+#: apt.conf.5.xml:258
msgid ""
"Security related option defaulting to true as an expiring validation for a "
"Release file prevents longtime replay attacks and can e.g. also help users "
@@ -6150,31 +6347,46 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:260
+#: apt.conf.5.xml:268
msgid "Max-ValidTime"
msgstr "Max-ValidTime"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:261
+#: apt.conf.5.xml:269
+msgid ""
+"Seconds the Release file should be considered valid after it was created "
+"(indicated by the <literal>Date</literal> header). If the Release file "
+"itself includes a <literal>Valid-Until</literal> header the earlier date of "
+"the two is used as the expiration date. The default value is <literal>0</"
+"literal> which stands for \"for ever\". Archive specific settings can be "
+"made by appending the label of the archive to the option name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:279
+#, fuzzy
+#| msgid "Max-ValidTime"
+msgid "Min-ValidTime"
+msgstr "Max-ValidTime"
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
msgid ""
-"Seconds the Release file should be considered valid after it was created. "
-"The default is \"for ever\" (0) if the Release file of the archive doesn't "
-"include a <literal>Valid-Until</literal> header. If it does then this date "
-"is the default. The date from the Release file or the date specified by the "
-"creation time of the Release file (<literal>Date</literal> header) plus the "
-"seconds specified with this options are used to check if the validation of a "
-"file has expired by using the earlier date of the two. Archive specific "
-"settings can be made by appending the label of the archive to the option "
-"name."
+"Minimum of seconds the Release file should be considered valid after it was "
+"created (indicated by the <literal>Date</literal> header). Use this if you "
+"need to use a seldomly updated (local) mirror of a more regular updated "
+"archive with a <literal>Valid-Until</literal> header instead of competely "
+"disabling the expiration date checking. Archive specific settings can and "
+"should be used by appending the label of the archive to the option name."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:290
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:274
+#: apt.conf.5.xml:291
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6184,12 +6396,20 @@ msgstr ""
"ルトã§ã¯ True ã§ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:294
+#, fuzzy
+#| msgid ""
+#| "Two sub-options to limit the use of PDiffs are also available: With "
+#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
+#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+#| "other hand is the maximum percentage of the size of all patches compared "
+#| "to the size of the targeted file. If one of these limits is exceeded the "
+#| "complete file is downloaded instead of the patches."
msgid ""
"Two sub-options to limit the use of PDiffs are also available: With "
"<literal>FileLimit</literal> can be specified how many PDiff files are "
"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum precentage of the size of all patches compared to "
+"other hand is the maximum percentage of the size of all patches compared to "
"the size of the targeted file. If one of these limits is exceeded the "
"complete file is downloaded instead of the patches."
msgstr ""
@@ -6200,13 +6420,13 @@ msgstr ""
"をダウンロードã™ã‚‹ä»£ã‚ã‚Šã«ã€å®Œå…¨ãªãƒ•ã‚¡ã‚¤ãƒ«ã‚’ダウンロードã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:303
msgid "Queue-Mode"
msgstr "Queue-Mode"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:304
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6221,13 +6441,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:311
msgid "Retries"
msgstr "Retries"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#: apt.conf.5.xml:312
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6236,13 +6456,13 @@ msgstr ""
"ãˆã‚‰ã‚ŒãŸå›žæ•°ã ã‘リトライを行ã„ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:299
+#: apt.conf.5.xml:316
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:300
+#: apt.conf.5.xml:317
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6253,13 +6473,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304 sources.list.5.xml:144
+#: apt.conf.5.xml:321 sources.list.5.xml:160
msgid "http"
msgstr "http"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:322
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6277,7 +6497,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#: apt.conf.5.xml:330
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6302,7 +6522,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323 apt.conf.5.xml:387
+#: apt.conf.5.xml:340 apt.conf.5.xml:404
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6314,7 +6534,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:343
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -6333,7 +6553,7 @@ msgstr ""
"ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:351
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6347,7 +6567,7 @@ msgstr ""
"ロードã—ãªããªã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„)。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:339
+#: apt.conf.5.xml:356
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -6359,12 +6579,12 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:362
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:363
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -6379,7 +6599,7 @@ msgstr ""
"ã„ã¾ã›ã‚“。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:352
+#: apt.conf.5.xml:369
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6416,13 +6636,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:370 sources.list.5.xml:155
+#: apt.conf.5.xml:387 sources.list.5.xml:171
msgid "ftp"
msgstr "ftp"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:388
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6455,7 +6675,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:407
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -6471,7 +6691,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:414
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6485,7 +6705,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:419
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6502,19 +6722,19 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:409 sources.list.5.xml:137
+#: apt.conf.5.xml:426 sources.list.5.xml:153
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:415
+#: apt.conf.5.xml:432
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"foo\";"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#: apt.conf.5.xml:427
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6535,13 +6755,13 @@ msgstr ""
"ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:437
msgid "gpgv"
msgstr "gpgv"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:421
+#: apt.conf.5.xml:438
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6552,18 +6772,18 @@ msgstr ""
"ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:443
msgid "CompressionTypes"
msgstr "CompressionTypes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:449
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:427
+#: apt.conf.5.xml:444
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6581,19 +6801,19 @@ msgstr ""
"ã™ã€‚構文ã¯ä»¥ä¸‹ã®ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚<placeholder type=\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:454
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:457
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:433
+#: apt.conf.5.xml:450
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6621,13 +6841,13 @@ msgstr ""
"<literal>bz2</literal> ã¯è‡ªå‹•çš„ã«è¿½åŠ ã•ã‚Œã‚‹ãŸã‚ã€æ˜Žç¤ºã™ã‚‹å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:461
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:442
+#: apt.conf.5.xml:459
#, fuzzy
#| msgid ""
#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
@@ -6644,9 +6864,9 @@ msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
"will only be used if this file exists, e.g. for the bzip2 method (the "
-"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
-"that list entries specified on the command line will be added at the end of "
-"the list specified in the configuration files, but before the default "
+"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+"also that list entries specified on the command line 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 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 "
@@ -6663,21 +6883,21 @@ msgstr ""
"ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:466
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
"uncompressed files so this is mostly only useable for local mirrors."
msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:454
+#: apt.conf.5.xml:471
msgid "GzipIndexes"
msgstr "GzipIndexes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:473
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -6686,12 +6906,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:463
+#: apt.conf.5.xml:480
msgid "Languages"
msgstr "Languages"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:481
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
@@ -6704,13 +6924,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:480
+#: apt.conf.5.xml:497
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:487
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -6734,7 +6954,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:253
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6745,13 +6965,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:487
+#: apt.conf.5.xml:504
msgid "Directories"
msgstr "ディレクトリ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:506
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6771,7 +6991,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:513
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6793,7 +7013,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:522
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6808,7 +7028,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:528
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -6820,7 +7040,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:532
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6838,7 +7058,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:540
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6858,7 +7078,7 @@ msgstr ""
"<filename>/tmp/staging/var/lib/dpkg/status</filename> ã‹ã‚‰æŽ¢ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:553
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -6870,13 +7090,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:562
msgid "APT in DSelect"
msgstr "DSelect ã§ã® APT"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:564
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6886,13 +7106,13 @@ msgstr ""
"設定項目ã§ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®å‹•ä½œã‚’制御ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:551
+#: apt.conf.5.xml:568
msgid "Clean"
msgstr "Clean"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:569
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6909,7 +7129,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:578
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6919,13 +7139,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:582
msgid "Updateoptions"
msgstr "Updateoptions"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:583
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6934,13 +7154,13 @@ msgstr ""
"ã•ã‚Œã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:587
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:588
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6950,13 +7170,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:594
msgid "How APT calls dpkg"
msgstr "APT ㌠dpkg を呼ã¶æ–¹æ³•"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:595
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6966,7 +7186,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:583
+#: apt.conf.5.xml:600
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -6976,18 +7196,18 @@ msgstr ""
"ã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。ã¾ãŸã€å„リストã¯å˜ä¸€ã®å¼•æ•°ã¨ã—㦠&dpkg; ã«æ¸¡ã•ã‚Œã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Post-Invoke"
msgstr "Post-Invoke"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:606
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -7001,13 +7221,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:612
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:613
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -7023,7 +7243,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:619
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -7039,13 +7259,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:626
msgid "Run-Directory"
msgstr "Run-Directory"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:627
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -7055,13 +7275,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:631
msgid "Build-options"
msgstr "Build-options"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:615
+#: apt.conf.5.xml:632
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -7070,12 +7290,12 @@ msgstr ""
"ã¾ã™ã€‚デフォルトã§ã¯ç½²åを無効ã«ã—ã€å…¨ãƒã‚¤ãƒŠãƒªã‚’生æˆã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:637
msgid "dpkg trigger usage (and related options)"
msgstr "dpkg トリガã®ä½¿ã„æ–¹ (ãŠã‚ˆã³é–¢é€£ã‚ªãƒ—ション)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:638
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiple calls of dpkg. Without further options dpkg will use triggers only "
@@ -7090,7 +7310,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:653
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -7104,7 +7324,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:647
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -7118,12 +7338,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:642
+#: apt.conf.5.xml:659
msgid "DPkg::NoTriggers"
msgstr "DPkg::NoTriggers"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:660
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -7136,12 +7356,12 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:650
+#: apt.conf.5.xml:667
msgid "PackageManager::Configure"
msgstr "PackageManager::Configure"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:668
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7158,12 +7378,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:678
msgid "DPkg::ConfigurePending"
msgstr "DPkg::ConfigurePending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:662
+#: apt.conf.5.xml:679
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -7174,12 +7394,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:685
msgid "DPkg::TriggersPending"
msgstr "DPkg::TriggersPending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:669
+#: apt.conf.5.xml:686
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7189,12 +7409,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:691
msgid "PackageManager::UnpackAll"
msgstr "PackageManager::UnpackAll"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:675
+#: apt.conf.5.xml:692
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-"
@@ -7206,12 +7426,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:699
msgid "OrderList::Score::Immediate"
msgstr "OrderList::Score::Immediate"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:707
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7229,7 +7449,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:700
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 "
@@ -7243,12 +7463,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:720
msgid "Periodic and Archives options"
msgstr "Periodic オプション㨠Archives オプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:721
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7262,12 +7482,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:729
msgid "Debug options"
msgstr "デãƒãƒƒã‚°ã‚ªãƒ—ション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:731
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7278,7 +7498,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:742
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7289,7 +7509,7 @@ msgstr ""
"ã«ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:750
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7300,7 +7520,7 @@ msgstr ""
"literal>) ã‚’è¡Œã†å ´åˆã«ä½¿ç”¨ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:759
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7312,7 +7532,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:750
+#: apt.conf.5.xml:767
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -7321,59 +7541,59 @@ msgstr ""
"を無効ã«ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:777
msgid "A full list of debugging options to apt follows."
msgstr "以下㯠apt ã«å¯¾ã™ã‚‹ãƒ‡ãƒãƒƒã‚°ã‚ªãƒ—ションã®ã™ã¹ã¦ã§ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:782
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:769
+#: apt.conf.5.xml:786
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:776
+#: apt.conf.5.xml:793
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:780
+#: apt.conf.5.xml:797
msgid "Print information related to downloading packages using FTP."
msgstr "FTP を用ã„ãŸãƒ‘ッケージã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã«é–¢ã™ã‚‹æƒ…報を出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:787
+#: apt.conf.5.xml:804
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:791
+#: apt.conf.5.xml:808
msgid "Print information related to downloading packages using HTTP."
msgstr "HTTP を用ã„ãŸãƒ‘ッケージã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã«é–¢ã™ã‚‹æƒ…報を出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:815
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:802
+#: apt.conf.5.xml:819
msgid "Print information related to downloading packages using HTTPS."
msgstr "HTTPS を用ã„ãŸãƒ‘ッケージã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã«é–¢ã™ã‚‹æƒ…報を出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:826
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:813
+#: apt.conf.5.xml:830
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7381,12 +7601,12 @@ msgstr ""
"<literal>gpg</literal> を用ã„ãŸæš—å·ç½²åã®æ¤œè¨¼ã«é–¢ã™ã‚‹æƒ…報を出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:820
+#: apt.conf.5.xml:837
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:841
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -7395,22 +7615,22 @@ msgstr ""
"ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:848
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:851
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr "&apt-get; ã§ã®æ§‹ç¯‰ä¾å­˜é–¢ä¿‚解決ã®ãƒ—ロセスを説明ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:858
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:861
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7418,12 +7638,12 @@ msgstr ""
"<literal>apt</literal> ライブラリãŒç”Ÿæˆã—ãŸã€æš—å·åŒ–ãƒãƒƒã‚·ãƒ¥ã‚’出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:868
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:871
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 "
@@ -7433,12 +7653,12 @@ msgstr ""
"システムã«ã‚る使用済・未使用ブロックã®æ•°ã‹ã‚‰ã®æƒ…報をå«ã‚ãªã„よã†ã«ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:879
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:882
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."
@@ -7447,23 +7667,23 @@ msgstr ""
"<quote><literal>apt-get update</literal></quote> を実行ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:873
+#: apt.conf.5.xml:890
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:894
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:884
+#: apt.conf.5.xml:901
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:887
+#: apt.conf.5.xml:904
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7472,12 +7692,12 @@ msgstr ""
"ジやエラーを出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:894
+#: apt.conf.5.xml:911
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:897
+#: apt.conf.5.xml:914
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7486,12 +7706,12 @@ msgstr ""
"ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:905
+#: apt.conf.5.xml:922
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:909
+#: apt.conf.5.xml:926
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7500,24 +7720,24 @@ msgstr ""
"リストã¸ã®ãƒ‘ッãƒé©ç”¨ã«é–¢ã™ã‚‹æƒ…報を出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:916
+#: apt.conf.5.xml:933
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:920
+#: apt.conf.5.xml:937
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:927
+#: apt.conf.5.xml:944
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:948
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7526,12 +7746,12 @@ msgstr ""
"ã«å‡ºåŠ›ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:955
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:941
+#: apt.conf.5.xml:958
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7546,12 +7766,12 @@ msgstr ""
"è·¯ã«å¯¾å¿œã—ã¦ã„ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:969
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:955
+#: apt.conf.5.xml:972
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7568,22 +7788,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:991
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:994
msgid "Dump the default configuration to standard error on startup."
msgstr "起動時ã«ã€æ¨™æº–エラー出力ã¸ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆè¨­å®šã‚’出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:984
+#: apt.conf.5.xml:1001
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:987
+#: apt.conf.5.xml:1004
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7592,12 +7812,12 @@ msgstr ""
"切られã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1012
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:998
+#: apt.conf.5.xml:1015
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7606,12 +7826,12 @@ msgstr ""
"を解æžä¸­ã«ç™ºç”Ÿã—ãŸã‚¨ãƒ©ãƒ¼ã‚’出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1022
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1009
+#: apt.conf.5.xml:1026
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7620,33 +7840,33 @@ msgstr ""
"ã®ãƒˆãƒ¬ãƒ¼ã‚¹ã‚’生æˆã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1034
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1021
+#: apt.conf.5.xml:1038
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr "&dpkg; を呼ã³å‡ºã™éš›ã«ã€å®Ÿè¡Œæ‰‹é †ã‚’追跡ã—ãŸçŠ¶æ…‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1028
+#: apt.conf.5.xml:1045
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1032
+#: apt.conf.5.xml:1049
msgid "Output the priority of each package list on startup."
msgstr "起動時ã®å„パッケージã®å„ªå…ˆåº¦ã‚’表示ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1055
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1042
+#: apt.conf.5.xml:1059
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7655,12 +7875,12 @@ msgstr ""
"ã—ãŸå ´åˆã«ã®ã¿ã€é©ç”¨ã•ã‚Œã¾ã™)。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1050
+#: apt.conf.5.xml:1067
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:1053
+#: apt.conf.5.xml:1070
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 "
@@ -7668,12 +7888,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1078
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1065
+#: apt.conf.5.xml:1082
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7683,7 +7903,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1088
+#: apt.conf.5.xml:1105
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7693,14 +7913,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1112
msgid "&file-aptconf;"
msgstr "&file-aptconf;"
# type: Content of: <refentry><refsect1><para>
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1100
+#: apt.conf.5.xml:1117
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7802,8 +8022,8 @@ msgstr ""
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
-"following naming convention: The files have no or \"<literal>pref</literal>"
-"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
"that it has ignored a file if the file doesn't match a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@ -8257,20 +8477,92 @@ msgstr ""
"Pin-Priority: 500\n"
"\n"
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+"\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+"\n"
+
+# type: <tag></tag>
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+#, fuzzy
+#| msgid "Packages"
+msgid "Package"
+msgstr "Packages"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:306
msgid "How APT Interprets Priorities"
msgstr "APT ãŒå„ªå…ˆåº¦ã«å‰²ã‚Šè¾¼ã‚€æ–¹æ³•"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:314
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:315
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8278,13 +8570,13 @@ msgstr ""
"パッケージãŒãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã—ã¦ã‚‚ã€ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:319
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8293,13 +8585,13 @@ msgstr ""
"å«ã¾ã‚Œãªãã¦ã‚‚ã€ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:325
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:326
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8308,13 +8600,13 @@ msgstr ""
"ジョンã®æ–¹ãŒæ–°ã—ã„ã®ã§ãªã‘ã‚Œã°ã€ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:288
+#: apt_preferences.5.xml:331
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:332
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8324,13 +8616,13 @@ msgstr ""
"ル"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:337
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:338
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8339,19 +8631,19 @@ msgstr ""
"ンストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:342
msgid "P &lt; 0"
msgstr "P &lt; 0"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:343
msgid "prevents the version from being installed"
msgstr "ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ç¦æ­¢"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:309
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8363,7 +8655,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:348
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8377,7 +8669,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:354
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8387,7 +8679,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:358
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8417,13 +8709,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:371
msgid "Then:"
msgstr "ã™ã‚‹ã¨ã€ä»¥ä¸‹ã®ã‚ˆã†ã«å‹•ä½œã—ã¾ã™ã€‚"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:373
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8438,7 +8730,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:378
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8450,7 +8742,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:382
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8464,13 +8756,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:392
msgid "Determination of Package Version and Distribution Properties"
msgstr "パッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¨ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションプロパティã®æ±ºå®š"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:394
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8481,30 +8773,30 @@ msgstr ""
"filename> ファイルをæä¾›ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:406
msgid "the <literal>Package:</literal> line"
msgstr "<literal>Package:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:364
+#: apt_preferences.5.xml:407
msgid "gives the package name"
msgstr "パッケージå"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
msgid "the <literal>Version:</literal> line"
msgstr "<literal>Version:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:411
msgid "gives the version number for the named package"
msgstr "ãã®åå‰ã®ãƒ‘ッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:398
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8524,13 +8816,13 @@ msgstr ""
"type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:427
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:428
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8547,19 +8839,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:438
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:444
msgid "the <literal>Codename:</literal> line"
msgstr "<literal>Codename:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:445
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -8577,14 +8869,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:454
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:461
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8600,7 +8892,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:470
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8613,13 +8905,13 @@ msgstr ""
"\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:479
msgid "the <literal>Component:</literal> line"
msgstr "<literal>Component:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:480
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8637,19 +8929,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:446
+#: apt_preferences.5.xml:489
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:452
+#: apt_preferences.5.xml:495
msgid "the <literal>Origin:</literal> line"
msgstr "<literal>Origin:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:453
+#: apt_preferences.5.xml:496
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8662,7 +8954,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:459
+#: apt_preferences.5.xml:502
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
@@ -8670,13 +8962,13 @@ msgstr ""
"\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:465
+#: apt_preferences.5.xml:508
msgid "the <literal>Label:</literal> line"
msgstr "<literal>Label:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:509
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8689,7 +8981,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:515
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
@@ -8698,7 +8990,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:416
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -8722,7 +9014,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:522
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8748,13 +9040,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:535
msgid "Optional Lines in an APT Preferences Record"
msgstr "APT 設定レコードã®ã‚ªãƒ—ション行"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:494
+#: apt_preferences.5.xml:537
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8765,13 +9057,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:503
+#: apt_preferences.5.xml:546
msgid "Tracking Stable"
msgstr "安定版ã®è¿½è·¡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:554
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8797,7 +9089,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8813,8 +9105,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8827,7 +9119,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:566
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8840,14 +9132,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:583
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>package</replaceable>/testing\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:577
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8861,13 +9153,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:589
msgid "Tracking Testing or Unstable"
msgstr "テスト版やä¸å®‰å®šç‰ˆã®è¿½è·¡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:555
+#: apt_preferences.5.xml:598
#, no-wrap
msgid ""
"Package: *\n"
@@ -8896,7 +9188,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:591
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8914,7 +9206,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:612
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8927,14 +9219,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:632
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>package</replaceable>/unstable\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:623
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -8953,13 +9245,13 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:596
+#: apt_preferences.5.xml:639
msgid "Tracking the evolution of a codename release"
msgstr "コードåリリースã®é€²åŒ–ã®è¿½è·¡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:610
+#: apt_preferences.5.xml:653
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8993,7 +9285,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:641
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -9017,7 +9309,7 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:670
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9030,14 +9322,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:647
+#: apt_preferences.5.xml:690
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:681
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -9057,13 +9349,13 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:699
msgid "&file-preferences;"
msgstr "&file-preferences;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:662
+#: apt_preferences.5.xml:705
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -9203,8 +9495,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:81
-#, no-wrap
-msgid "deb uri distribution [component1] [component2] [...]"
+#, fuzzy, no-wrap
+#| msgid "deb uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri distribution [component1] [component2] [...]"
msgstr "deb uri distribution [component1] [component2] [...]"
# type: Content of: <refentry><refsect1><para>
@@ -9272,10 +9565,42 @@ msgstr ""
"ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã®ã«ä¾¿åˆ©ã§ã™ã€‚APT ã¯ã€å¸¯åŸŸã®ç‹­ã„サイトを効率よã扱ã†ã®ã«ã€ç•°ãª"
"るホストã¸ã¯ã€æŽ¥ç¶šã‚’並行ã—ã¦è¡Œã†ã‚ˆã†ã«ã‚‚ã—ã¦ã„ã¾ã™ã€‚"
-# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:112
msgid ""
+"<literal>options</literal> is always optional and needs to be surounded by "
+"square brackets. It can consist of multiple settings in the form "
+"<literal><replaceable>setting</replaceable>=<replaceable>value</"
+"replaceable></literal>. Multiple settings are separated by spaces. The "
+"following settings are supported by APT, note through that unsupported "
+"settings will be ignored silently:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:117
+msgid ""
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> can be used to specify for which architectures "
+"packages information should be downloaded. If this option is not set all "
+"architectures defined by the <literal>APT::Architectures</literal> option "
+"will be downloaded."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:128
+msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@ -9288,12 +9613,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:133
msgid "Some examples:"
msgstr "例:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:119
+#: sources.list.5.xml:135
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -9306,19 +9631,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:125
+#: sources.list.5.xml:141
msgid "URI specification"
msgstr "URI ã®ä»•æ§˜"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:146
msgid "file"
msgstr "ファイル"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:132
+#: sources.list.5.xml:148
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -9329,7 +9654,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:155
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -9340,7 +9665,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:162
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9357,7 +9682,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:173
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -9376,13 +9701,13 @@ msgstr ""
"ã‚Œã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:182
msgid "copy"
msgstr "copy"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:184
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -9393,18 +9718,18 @@ msgstr ""
"ã¦ã€APT ã§ã‚³ãƒ”ーを行ã†å ´åˆã«ä¾¿åˆ©ã§ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "rsh"
msgstr "rsh"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "ssh"
msgstr "ssh"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:191
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -9419,12 +9744,12 @@ msgstr ""
"ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:199
msgid "more recognizable URI types"
msgstr "ã•ã‚‰ã«èªè­˜ã§ãã‚‹ URI タイプ"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:185
+#: sources.list.5.xml:201
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
@@ -9438,7 +9763,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:143
msgid ""
"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -9448,7 +9773,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:215
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -9457,38 +9782,61 @@ msgstr ""
"free 用ã®ãƒ­ãƒ¼ã‚«ãƒ« (ã¾ãŸã¯ NFS) アーカイブを使用ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:203
+#: sources.list.5.xml:219
msgid "As above, except this uses the unstable (development) distribution."
msgstr "上記åŒæ§˜ã§ã™ãŒã€ä¸å®‰å®šç‰ˆ (開発版) を使用ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:220
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:222
msgid "Source line for the above"
msgstr "上記ã®ã‚½ãƒ¼ã‚¹è¡Œ"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:223
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:225
+msgid ""
+"The first line gets package information for the architectures in "
+"<literal>APT::Architectures</literal> while the second always retrieves "
+"<literal>amd64</literal> and <literal>armel</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:227
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#| " "
+msgid ""
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgstr ""
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+" "
+
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:209
+#: sources.list.5.xml:230
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -9498,14 +9846,14 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:211
+#: sources.list.5.xml:232
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:234
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -9515,14 +9863,14 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:236
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:238
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -9536,13 +9884,13 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:251
#, fuzzy, no-wrap
#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
@@ -9550,7 +9898,7 @@ msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:244
#, fuzzy
#| msgid ""
#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@ -9579,7 +9927,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:256
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
@@ -10767,6 +11115,37 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "ã“ã‚Œã§ã€disc ã«ã‚ã‚‹å–得済ã¿ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–を使用ã™ã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚"
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "Update the local keyring with the keyring of Debian archive keys and "
+#~ "removes from the keyring the archive keys which are no longer valid."
+#~ msgstr ""
+#~ "Debian アーカイブキーã§ã€ãƒ­ãƒ¼ã‚«ãƒ«ã‚­ãƒ¼ãƒªãƒ³ã‚°ã‚’æ›´æ–°ã—ã€ã‚‚ã†æœ‰åŠ¹ã§ãªã„キーを"
+#~ "キーリングã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã€‚"
+
+#~ msgid "unmarkauto"
+#~ msgstr "unmarkauto"
+
+#~ msgid "<option>-h</option>"
+#~ msgstr "<option>-h</option>"
+
+#~ msgid "<option>--help</option>"
+#~ msgstr "<option>--help</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid "Show a short usage summary."
+#~ msgstr "短ã„使用方法を表示ã—ã¾ã™ã€‚"
+
+#~ msgid "<option>-v</option>"
+#~ msgstr "<option>-v</option>"
+
+#~ msgid "<option>--version</option>"
+#~ msgstr "<option>--version</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid "Show the program version."
+#~ msgstr "プログラムã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報を表示ã—ã¾ã™"
+
#~ msgid "<option>--md5</option>"
#~ msgstr "<option>--md5</option>"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 16b719978..2f7566fe4 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2011-04-05 10:22+0300\n"
+"POT-Creation-Date: 2011-11-10 16:42+0100\n"
"PO-Revision-Date: 2010-03-18 22:00+0100\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -787,8 +787,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
msgid "Description"
@@ -810,7 +810,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:120
+#: apt-cache.8.xml:70 apt-get.8.xml:127
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -1335,8 +1335,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
+#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
msgid "options"
msgstr "opcje"
@@ -1363,7 +1363,7 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
#: apt-sortpkgs.1.xml:61
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1391,12 +1391,12 @@ msgstr ""
"Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1503,7 +1503,7 @@ msgstr "<option>--no-act</option>"
#| "<literal>APT::Cache::RecurseDepends</literal>."
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be twicked with these flags which will omit "
+"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
"Cache::ShowRecommends</literal>."
@@ -1514,7 +1514,7 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Cache::RecurseDepends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
+#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
msgid "<option>-f</option>"
msgstr "<option>-f</option>"
@@ -1534,7 +1534,8 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+#: apt-get.8.xml:452
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -1660,14 +1661,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:596
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
+#: apt-cache.8.xml:372 apt-get.8.xml:601 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt.conf.5.xml:1110 apt_preferences.5.xml:697
msgid "Files"
msgstr "Pliki"
@@ -1678,10 +1679,10 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
-#: sources.list.5.xml:234
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:611
+#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
msgid "See Also"
msgstr "Zobacz także"
@@ -1693,8 +1694,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:617
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "Diagnostyka"
@@ -1837,12 +1838,12 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:161
msgid "Options"
msgstr "Opcje"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -1888,7 +1889,7 @@ msgstr ""
"CDROM::Rename</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:364
+#: apt-cdrom.8.xml:116 apt-get.8.xml:375
msgid "<option>-m</option>"
msgstr "<option>-m</option>"
@@ -1948,17 +1949,17 @@ msgstr ""
"znajdzie wszystkie takie pliki."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:395
+#: apt-cdrom.8.xml:143 apt-get.8.xml:406
msgid "<option>--just-print</option>"
msgstr "<option>--just-print</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:397
+#: apt-cdrom.8.xml:144 apt-get.8.xml:408
msgid "<option>--recon</option>"
msgstr "<option>--recon</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:398
+#: apt-cdrom.8.xml:145 apt-get.8.xml:409
msgid "<option>--no-act</option>"
msgstr "<option>--no-act</option>"
@@ -2105,7 +2106,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Wyświetla zawartość przestrzeni konfiguracji."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
#: apt-sortpkgs.1.xml:73
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2183,7 +2184,7 @@ msgstr ""
"config.XXXX</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
+#: apt-extracttemplates.1.xml:63 apt-get.8.xml:530
msgid "<option>-t</option>"
msgstr "<option>-t</option>"
@@ -2432,7 +2433,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:287
+#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
msgid "clean"
msgstr "clean"
@@ -2901,8 +2902,8 @@ msgid ""
"free</literal>"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
msgid "Architectures"
msgstr ""
@@ -3106,20 +3107,20 @@ msgid ""
"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
"replaceable>::<replaceable>Checksum</replaceable></literal> where "
-"<literal>Index</literal> can be <literal>Packages</literal>, "
-"<literal>Sources</literal> or <literal>Release</literal> and "
-"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
-"literal> or <literal>SHA256</literal>."
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:539
+#: apt-ftparchive.1.xml:540
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
#, fuzzy
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
@@ -3130,7 +3131,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:547
+#: apt-ftparchive.1.xml:548
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3144,13 +3145,13 @@ msgstr ""
"pliku konfiguracyjnym: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:556
#, fuzzy
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
@@ -3164,12 +3165,12 @@ msgstr ""
"<literal>APT::Cache::Generate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3179,13 +3180,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:571
+#: apt-ftparchive.1.xml:572
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
#, fuzzy
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
@@ -3197,13 +3198,13 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:578
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:580
#, fuzzy
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
@@ -3213,14 +3214,14 @@ msgstr ""
"pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:584
#, fuzzy
#| msgid "<option>-a</option>"
msgid "<option>--arch</option>"
msgstr "<option>-a</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:585
#, fuzzy
#| msgid ""
#| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -3240,13 +3241,13 @@ msgstr ""
"AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:590
+#: apt-ftparchive.1.xml:591
#, fuzzy
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3260,13 +3261,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:602
+#: apt-ftparchive.1.xml:603
#, fuzzy
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:605
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3276,19 +3277,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
-#: sources.list.5.xml:198
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
msgid "Examples"
msgstr "Przykłady"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:618
+#: apt-ftparchive.1.xml:619
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3296,7 +3297,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:632
+#: apt-ftparchive.1.xml:633
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3367,10 +3368,11 @@ msgid ""
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <group choice=\"req\"> <arg "
-"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
-"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
-"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
+"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
+"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
+"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
+"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
+"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
@@ -3424,7 +3426,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:115
+#: apt-get.8.xml:122
#, fuzzy
#| msgid ""
#| "<command>apt-get</command> is the command-line tool for handling "
@@ -3444,13 +3446,13 @@ msgstr ""
"&wajig;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:124 apt-key.8.xml:127
+#: apt-get.8.xml:131 apt-key.8.xml:127
msgid "update"
msgstr "update"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:132
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources. The indexes of available packages are fetched from the "
@@ -3474,13 +3476,13 @@ msgstr ""
"<filename>Packages.gz</filename> nie jest wcześniej znany."
#. type: <tag></tag>
-#: apt-get.8.xml:136 guide.sgml:121
+#: apt-get.8.xml:143 guide.sgml:121
msgid "upgrade"
msgstr "upgrade"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:137
+#: apt-get.8.xml:144
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -3505,13 +3507,13 @@ msgstr ""
"wcześniej wykonać <literal>update</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:149
+#: apt-get.8.xml:156
msgid "dselect-upgrade"
msgstr "dselect-upgrade"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:150
+#: apt-get.8.xml:157
msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3529,13 +3531,13 @@ msgstr ""
"nowych)."
#. type: <tag></tag>
-#: apt-get.8.xml:159 guide.sgml:140
+#: apt-get.8.xml:166 guide.sgml:140
msgid "dist-upgrade"
msgstr "dist-upgrade"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:167
msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3559,13 +3561,13 @@ msgstr ""
"poszczególnych pakietów."
#. type: <tag></tag>
-#: apt-get.8.xml:172 guide.sgml:131
+#: apt-get.8.xml:179 guide.sgml:131
msgid "install"
msgstr "install"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:181
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
@@ -3595,7 +3597,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:199
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -3613,7 +3615,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:206
msgid ""
"Both of the version selection mechanisms can downgrade packages and must be "
"used with care."
@@ -3623,7 +3625,7 @@ msgstr ""
"ostrożnie."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:202
+#: apt-get.8.xml:209
msgid ""
"This is also the target to use if you want to upgrade one or more already-"
"installed packages without upgrading every package you have on your system. "
@@ -3644,7 +3646,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:220
msgid ""
"Finally, the &apt-preferences; mechanism allows you to create an alternative "
"installation policy for individual packages."
@@ -3654,7 +3656,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:224
msgid ""
"If no package matches the given expression and the expression contains one "
"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3675,13 +3677,13 @@ msgstr ""
"lub \"$\", można też stworzyć bardziej specyficzne wyrażenie regularne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:233
msgid "remove"
msgstr "remove"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:227
+#: apt-get.8.xml:234
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note the removing a package "
@@ -3695,12 +3697,12 @@ msgstr ""
"pakiet zostanie zainstalowany zamiast zostać usunięty."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:241
msgid "purge"
msgstr "purge"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:235
+#: apt-get.8.xml:242
msgid ""
"<literal>purge</literal> is identical to <literal>remove</literal> except "
"that packages are removed and purged (any configuration files are deleted "
@@ -3711,13 +3713,13 @@ msgstr ""
"wszystkie pliki konfiguracyjne)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:246
msgid "source"
msgstr "source"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:240
+#: apt-get.8.xml:247
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -3737,7 +3739,7 @@ msgstr ""
"wydanie</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:248
+#: apt-get.8.xml:255
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
"src</literal> type lines in the &sources-list; file. This means that you "
@@ -3753,12 +3755,19 @@ msgstr ""
"jest zainstalowana lub możliwa do zainstalowania."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:262
+#, fuzzy
+#| msgid ""
+#| "If the <option>--compile</option> option is specified then the package "
+#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+#| "command>, if <option>--download-only</option> is specified then the "
+#| "source package will not be unpacked."
msgid ""
"If the <option>--compile</option> option is specified then the package will "
-"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
-"<option>--download-only</option> is specified then the source package will "
-"not be unpacked."
+"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+"the architecture as defined by the <command>--host-architecture</command> "
+"option. If <option>--download-only</option> is specified then the source "
+"package will not be unpacked."
msgstr ""
"Jeżeli podano opcję <option>--compile</option>, to pakiet źródłowy zostanie "
"skompilowany do pakietu binarnego .deb za pomocÄ… programu <command>dpkg-"
@@ -3767,7 +3776,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:260
+#: apt-get.8.xml:269
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -3783,7 +3792,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:275
msgid ""
"Note that source packages are not tracked like binary packages, they exist "
"only in the current directory and are similar to downloading source tar "
@@ -3794,29 +3803,36 @@ msgstr ""
"ściągnięte oryginalne źródła programu ze strony jego autorów."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:280
msgid "build-dep"
msgstr "build-dep"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:281
+#, fuzzy
+#| msgid ""
+#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+#| "an attempt to satisfy the build dependencies for a source package."
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
-"attempt to satisfy the build dependencies for a source package."
+"attempt to satisfy the build dependencies for a source package. By default "
+"the dependencies are satisfied to build the package nativly. If desired a "
+"host-architecture can be specified with the <option>--host-architecture</"
+"option> option instead."
msgstr ""
"<literal>build-dep</literal> powoduje, że apt-get zainstaluje/usunie pakiety "
"tak, żeby spełnić zależności wymagane do zbudowania danego pakietu "
"źródłowego."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:276
+#: apt-get.8.xml:287
msgid "check"
msgstr "check"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:288
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
@@ -3825,20 +3841,20 @@ msgstr ""
"bufor (cache) pakietów i szuka zepsutych pakietów."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:292
msgid "download"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:293
msgid ""
"<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:299
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -3857,13 +3873,13 @@ msgstr ""
"literal>, aby zwolnić trochę miejsca na dysku."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid "autoclean"
msgstr "autoclean"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:298
+#: apt-get.8.xml:309
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -3883,28 +3899,33 @@ msgstr ""
"zawierajÄ…cych zainstalowane pakiety."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:307
+#: apt-get.8.xml:318
msgid "autoremove"
msgstr "autoremove"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:319
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for some package and that "
+#| "are no more needed."
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for some package and that "
-"are no more needed."
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
msgstr ""
"<literal>autoremove</literal> jest używane do usuwania pakietów, które "
"zostały zainstalowane automatycznie, żeby rozwiązać zależności, i nie są już "
"potrzebne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:323
msgid "changelog"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:324
msgid ""
"<literal>changelog</literal> downloads a package changelog and displays it "
"through <command>sensible-pager</command>. The server name and base "
@@ -3917,12 +3938,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:335
+#: apt-get.8.xml:346
msgid "<option>--no-install-recommends</option>"
msgstr "<option>--no-install-recommends</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:336
+#: apt-get.8.xml:347
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3931,14 +3952,14 @@ msgstr ""
"Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:340
+#: apt-get.8.xml:351
#, fuzzy
#| msgid "<option>--no-upgrade</option>"
msgid "<option>--install-suggests</option>"
msgstr "<option>--no-upgrade</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:341
+#: apt-get.8.xml:352
#, fuzzy
#| msgid ""
#| "Do not consider recommended packages as a dependency for installing. "
@@ -3951,13 +3972,13 @@ msgstr ""
"Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:356
msgid "<option>--download-only</option>"
msgstr "<option>--download-only</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:357
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -3967,13 +3988,13 @@ msgstr ""
"Download-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:350
+#: apt-get.8.xml:361
msgid "<option>--fix-broken</option>"
msgstr "<option>--fix-broken</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:362
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -4000,18 +4021,18 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:375
msgid "<option>--ignore-missing</option>"
msgstr "<option>--ignore-missing</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:365
+#: apt-get.8.xml:376
msgid "<option>--fix-missing</option>"
msgstr "<option>--fix-missing</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:366
+#: apt-get.8.xml:377
msgid ""
"Ignore missing packages; If packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -4030,13 +4051,13 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Get::Fix-Missing</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:387
msgid "<option>--no-download</option>"
msgstr "<option>--no-download</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:388
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -4049,7 +4070,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:384
+#: apt-get.8.xml:395
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4069,18 +4090,18 @@ msgstr ""
"spodziewa. Pozycja w pliku konfiguracyjnym: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:405
msgid "<option>--simulate</option>"
msgstr "<option>--simulate</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:407
msgid "<option>--dry-run</option>"
msgstr "<option>--dry-run</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:410
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -4091,7 +4112,7 @@ msgstr ""
"Get::Simulate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:414
msgid ""
"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
"literal>) automatic. Also a notice will be displayed indicating that this "
@@ -4111,7 +4132,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:420
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4125,23 +4146,23 @@ msgstr ""
"znana (rzadkość)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>-y</option>"
msgstr "<option>-y</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>--yes</option>"
msgstr "<option>--yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:417
+#: apt-get.8.xml:428
msgid "<option>--assume-yes</option>"
msgstr "<option>--assume-yes</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:418
+#: apt-get.8.xml:429
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -4157,18 +4178,39 @@ msgstr ""
"Assume-Yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:436
+#, fuzzy
+#| msgid "<option>--assume-yes</option>"
+msgid "<option>--assume-no</option>"
+msgstr "<option>--assume-yes</option>"
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:437
+#, fuzzy
+#| msgid ""
+#| "Compile source packages after downloading them. Configuration Item: "
+#| "<literal>APT::Get::Compile</literal>."
+msgid ""
+"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+"Skompiluj pakiety źródłowe po ich ściągnięciu. Pozycja w pliku "
+"konfiguracyjnym: <literal>APT::Get::Compile</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:441
msgid "<option>-u</option>"
msgstr "<option>-u</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:441
msgid "<option>--show-upgraded</option>"
msgstr "<option>--show-upgraded</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:442
msgid ""
"Show upgraded packages; Print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4178,18 +4220,18 @@ msgstr ""
"Upgraded</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>-V</option>"
msgstr "<option>-V</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>--verbose-versions</option>"
msgstr "<option>--verbose-versions</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:448
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -4198,23 +4240,41 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Get::Show-Versions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:453
+#, fuzzy
+#| msgid "<option>--recurse</option>"
+msgid "<option>--host-architecture</option>"
+msgstr "<option>--recurse</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:454
+msgid ""
+"This option controls the architecture packages are built for by <command>apt-"
+"get source --compile</command> and how cross-builddependencies are "
+"satisfied. By default is not set which means that the host architecture is "
+"the same as the build architecture (which is defined by <literal>APT::"
+"Architecture</literal>) Configuration Item: <literal>APT::Get::Host-"
+"Architecture</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:462
msgid "<option>-b</option>"
msgstr "<option>-b</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:462
msgid "<option>--compile</option>"
msgstr "<option>--compile</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:463
msgid "<option>--build</option>"
msgstr "<option>--build</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:464
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -4223,13 +4283,13 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Get::Compile</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:468
msgid "<option>--ignore-hold</option>"
msgstr "<option>--ignore-hold</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:469
msgid ""
"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -4243,13 +4303,13 @@ msgstr ""
"<literal>APT::Ignore-Hold</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:475
msgid "<option>--no-upgrade</option>"
msgstr "<option>--no-upgrade</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:450
+#: apt-get.8.xml:476
msgid ""
"Do not upgrade packages; When used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4262,7 +4322,7 @@ msgstr ""
"<literal>APT::Get::Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:482
#, fuzzy
#| msgid "<option>--no-upgrade</option>"
msgid "<option>--only-upgrade</option>"
@@ -4270,7 +4330,7 @@ msgstr "<option>--no-upgrade</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:483
#, fuzzy
#| msgid ""
#| "Do not upgrade packages; When used in conjunction with <literal>install</"
@@ -4289,13 +4349,13 @@ msgstr ""
"<literal>APT::Get::Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:489
msgid "<option>--force-yes</option>"
msgstr "<option>--force-yes</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:490
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -4311,13 +4371,13 @@ msgstr ""
"force-yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:497
msgid "<option>--print-uris</option>"
msgstr "<option>--print-uris</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:498
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -4339,13 +4399,13 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:508
msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:509
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4359,13 +4419,13 @@ msgstr ""
"pliku konfiguracyjnym: <literal>APT::Get::Purge</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:516
msgid "<option>--reinstall</option>"
msgstr "<option>--reinstall</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:517
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4374,13 +4434,13 @@ msgstr ""
"Pozycja w pliku konfiguracyjnym: <literal>APT::Get::ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:495
+#: apt-get.8.xml:521
msgid "<option>--list-cleanup</option>"
msgstr "<option>--list-cleanup</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:522
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -4397,18 +4457,18 @@ msgstr ""
"konfiguracyjnym: <literal>APT::Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:505
+#: apt-get.8.xml:531
msgid "<option>--target-release</option>"
msgstr "<option>--target-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:532
msgid "<option>--default-release</option>"
msgstr "<option>--default-release</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:533
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -4431,13 +4491,13 @@ msgstr ""
"stronę podręcznika &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:546
msgid "<option>--trivial-only</option>"
msgstr "<option>--trivial-only</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:522
+#: apt-get.8.xml:548
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4451,13 +4511,13 @@ msgstr ""
"Get::Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:554
msgid "<option>--no-remove</option>"
msgstr "<option>--no-remove</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:555
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4467,12 +4527,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:534
+#: apt-get.8.xml:560
msgid "<option>--auto-remove</option>"
msgstr "<option>--auto-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:561
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4486,13 +4546,13 @@ msgstr ""
"AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:567
msgid "<option>--only-source</option>"
msgstr "<option>--only-source</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:568
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -4511,23 +4571,23 @@ msgstr ""
"Only-Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--diff-only</option>"
msgstr "<option>--diff-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--dsc-only</option>"
msgstr "<option>--dsc-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--tar-only</option>"
msgstr "<option>--tar-only</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:553
+#: apt-get.8.xml:579
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4538,13 +4598,13 @@ msgstr ""
"Dsc-Only</literal> oraz <literal>APT::Get::Tar-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:558
+#: apt-get.8.xml:584
msgid "<option>--arch-only</option>"
msgstr "<option>--arch-only</option>"
#
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:585
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -4555,12 +4615,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:589
msgid "<option>--allow-unauthenticated</option>"
msgstr "<option>--allow-unauthenticated</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:564
+#: apt-get.8.xml:590
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -4571,7 +4631,7 @@ msgstr ""
"w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:603
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
@@ -4581,7 +4641,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:612
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4593,7 +4653,7 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:618
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -4602,22 +4662,22 @@ msgstr ""
"w przypadku błędu."
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:595
+#: apt-get.8.xml:621
msgid "ORIGINAL AUTHORS"
msgstr "AUTORZY ORYGINAÅU"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:596
+#: apt-get.8.xml:622
msgid "&apt-author.jgunthorpe;"
msgstr "&apt-author.jgunthorpe;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:599
+#: apt-get.8.xml:625
msgid "CURRENT AUTHORS"
msgstr "OBECNI AUTORZY"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:601
+#: apt-get.8.xml:627
msgid "&apt-author.team;"
msgstr "&apt-author.team;"
@@ -4747,14 +4807,33 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:131
msgid ""
-"Update the local keyring with the keyring of Debian archive keys and removes "
-"from the keyring the archive keys which are no longer valid."
+"Update the local keyring with the archive keyring and remove from the local "
+"keyring the archive keys which are no longer valid. The archive keyring is "
+"shipped in the <literal>archive-keyring</literal> package of your "
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:141
+#, fuzzy
+#| msgid "update"
+msgid "net-update"
+msgstr "update"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:145
+msgid ""
+"Work similar to the <command>update</command> command above, but get the "
+"archive keyring from an URI instead and validate it against a master key. "
+"This requires an installed &wget; and an APT build configured to have a "
+"server to fetch from and a master keyring to validate. APT in Debian does "
+"not support this command and relies on <command>update</command> instead, "
+"but Ubuntu's APT does."
msgstr ""
-"Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum "
-"Debiana i usuwa z lokalnej składnicy nieaktualne już klucze archiwów Debiana."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:162
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
@@ -4763,12 +4842,12 @@ msgstr ""
"opisanymi w poprzednim rozdziale."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:164
msgid "--keyring <replaceable>filename</replaceable>"
msgstr "--keyring <replaceable>nazwa_pliku</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:165
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -4784,53 +4863,66 @@ msgstr ""
"kluczy, co oznacza na przykład to, że nowe klucze będą dodawane właśnie tam."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:178
msgid "&file-trustedgpg;"
msgstr "&file-trustedgpg;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:180
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:181
msgid "Local trust database of archive keys."
msgstr "Lokalna składnica zaufanych kluczy archiwum."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#: apt-key.8.xml:184
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
-msgid "Keyring of Debian archive trusted keys."
+#: apt-key.8.xml:185
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Składnica zaufanych kluczy archiwum Debiana."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:188
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
-msgid "Keyring of Debian archive removed trusted keys."
+#: apt-key.8.xml:189
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:198
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
+#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+#| "August 2009</date>"
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
msgstr ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; "
"<date>9 sierpnia 2009</date>"
@@ -4847,13 +4939,22 @@ msgstr "Zaznaczanie/odznaczanie pakietu jako zainstalowanego automatycznie."
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:39
+#, fuzzy
+#| msgid ""
+#| " <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
+#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
msgstr ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>NAZWA_PLIKU</replaceable></option></arg> <group choice=\"plain"
@@ -4863,7 +4964,7 @@ msgstr ""
"arg> <arg choice=\"plain\">showauto</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
@@ -4872,7 +4973,7 @@ msgstr ""
"zainstalowany automatycznie."
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4888,14 +4989,21 @@ msgstr ""
"get</command> lub <command>aptitude</command>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+#, fuzzy
+#| msgid "markauto"
+msgid "auto"
msgstr "markauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
+#, fuzzy
+#| msgid ""
+#| "<literal>markauto</literal> is used to mark a package as being "
+#| "automatically installed, which will cause the package to be removed when "
+#| "no more manually installed packages depend on this package."
msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
@@ -4904,14 +5012,19 @@ msgstr ""
"żaden inny ręcznie zainstalowany pakiet nie będzie od niego zależał."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
-msgstr "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
+msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
+#, fuzzy
+#| msgid ""
+#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
@@ -4920,22 +5033,98 @@ msgstr ""
"sytuacji gdy żaden inny pakiet nie będzie od niego zależał."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
+#: apt-mark.8.xml:85
+msgid "hold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:86
+msgid ""
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed. The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:96
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>showauto</literal> jest używane do wypisania listy wszystkich "
+"pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
+"osobnej linii."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:101
msgid "showauto"
msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"installed packages with each package on a new line. All automatically "
+"installed packages will be listed if no package is given. If packages are "
+"given only those which are automatically installed will be shown."
msgstr ""
"<literal>showauto</literal> jest używane do wypisania listy wszystkich "
"pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
"osobnej linii."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:109
+#, fuzzy
+#| msgid "showauto"
+msgid "showmanual"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:116
+#, fuzzy
+#| msgid "showauto"
+msgid "showhold"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:117
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showauto</literal> jest używane do wypisania listy wszystkich "
+"pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
+"osobnej linii."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:130
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
@@ -4943,7 +5132,7 @@ msgstr ""
"option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:131
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -4952,7 +5141,7 @@ msgstr ""
"option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:134
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -4964,51 +5153,19 @@ msgstr ""
"domyślny plik <filename>extended_status</filename> znajdujący się w katalogu "
"określonym w pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
-msgstr "<option>-h</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
-msgstr "<option>--help</option>"
-
-#
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
-msgstr "Wyświetla krótkie informacje na temat użytkowania."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
-msgstr "<option>-v</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
-msgstr "<option>--version</option>"
-
-#
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
-msgstr "Wyświetla wersję programu."
-
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
msgid " &file-extended_states;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-get;,&aptitude;,&apt-conf;"
#
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -5371,14 +5528,29 @@ msgstr ""
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:52
+#, fuzzy
+#| msgid ""
+#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
+#| "to add sources.list entries in separate files. The format is the same as "
+#| "for the regular <filename>sources.list</filename> file. File names need "
+#| "to end with <filename>.list</filename> and may only contain letters (a-z "
+#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
+#| "characters. Otherwise they will be silently ignored."
msgid ""
"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
-"order which have no or \"<literal>conf</literal>\" as filename extension and "
-"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
-"characters. Otherwise APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters. Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
msgstr ""
+"Katalog <filename>/etc/apt/sources.list.d</filename> umożliwia podzielenie "
+"pliku źródeł na osobne pliki. Format jest dokładnie taki sam, jak w "
+"przypadku zwykłego pliku <filename>sources.list</filename>. Nazwy plików w "
+"tym katalogu muszą się kończyć rozszerzeniem <filename>.list</filename> i "
+"mogą składać się tylko z liter (a-z i A-Z), cyfr (0-9), znaku podkreślenia "
+"(_), pauzy (-) i kropki (.). Inne pliki zostanÄ… zignorowane."
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:59
@@ -5555,13 +5727,24 @@ msgid ""
"compiled for."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:158
+msgid ""
+"All Architectures the system supports. Processors implementing the "
+"<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
+"<literal>i386</literal>; This list is use when fetching files and parsing "
+"package lists. The internal default is always the native architecture "
+"(<literal>APT::Architecture</literal>) and all foreign architectures it can "
+"retrieve by calling <command>dpkg --print-foreign-architectures</command>."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:165
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:166
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5570,25 +5753,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:171
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:164
+#: apt.conf.5.xml:172
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:176
#, fuzzy
msgid "Clean-Installed"
msgstr "B<--installed>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:177
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -5597,12 +5780,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:175
+#: apt.conf.5.xml:183
msgid "Immediate-Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:176
+#: apt.conf.5.xml:184
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -5635,12 +5818,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:198
+#: apt.conf.5.xml:206
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:207
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -5651,12 +5834,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:215
msgid "Cache-Start, Cache-Grow and Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
+#: apt.conf.5.xml:216
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
@@ -5676,63 +5859,63 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:223
+#: apt.conf.5.xml:231
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:232
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:235
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:236
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:240
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:241
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:245
msgid "CDROM"
msgstr "CDROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:238
+#: apt.conf.5.xml:246
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:244
+#: apt.conf.5.xml:252
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:249
+#: apt.conf.5.xml:257
msgid "Check-Valid-Until"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:250
+#: apt.conf.5.xml:258
msgid ""
"Security related option defaulting to true as an expiring validation for a "
"Release file prevents longtime replay attacks and can e.g. also help users "
@@ -5744,54 +5927,67 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:260
+#: apt.conf.5.xml:268
msgid "Max-ValidTime"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:261
+#: apt.conf.5.xml:269
+msgid ""
+"Seconds the Release file should be considered valid after it was created "
+"(indicated by the <literal>Date</literal> header). If the Release file "
+"itself includes a <literal>Valid-Until</literal> header the earlier date of "
+"the two is used as the expiration date. The default value is <literal>0</"
+"literal> which stands for \"for ever\". Archive specific settings can be "
+"made by appending the label of the archive to the option name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:279
+msgid "Min-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
msgid ""
-"Seconds the Release file should be considered valid after it was created. "
-"The default is \"for ever\" (0) if the Release file of the archive doesn't "
-"include a <literal>Valid-Until</literal> header. If it does then this date "
-"is the default. The date from the Release file or the date specified by the "
-"creation time of the Release file (<literal>Date</literal> header) plus the "
-"seconds specified with this options are used to check if the validation of a "
-"file has expired by using the earlier date of the two. Archive specific "
-"settings can be made by appending the label of the archive to the option "
-"name."
+"Minimum of seconds the Release file should be considered valid after it was "
+"created (indicated by the <literal>Date</literal> header). Use this if you "
+"need to use a seldomly updated (local) mirror of a more regular updated "
+"archive with a <literal>Valid-Until</literal> header instead of competely "
+"disabling the expiration date checking. Archive specific settings can and "
+"should be used by appending the label of the archive to the option name."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:290
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:274
+#: apt.conf.5.xml:291
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:294
msgid ""
"Two sub-options to limit the use of PDiffs are also available: With "
"<literal>FileLimit</literal> can be specified how many PDiff files are "
"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum precentage of the size of all patches compared to "
+"other hand is the maximum percentage of the size of all patches compared to "
"the size of the targeted file. If one of these limits is exceeded the "
"complete file is downloaded instead of the patches."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:303
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:304
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -5801,37 +5997,37 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:311
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#: apt.conf.5.xml:312
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:299
+#: apt.conf.5.xml:316
#, fuzzy
msgid "Source-Symlinks"
msgstr "Sources"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:300
+#: apt.conf.5.xml:317
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304 sources.list.5.xml:144
+#: apt.conf.5.xml:321 sources.list.5.xml:160
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:322
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -5842,7 +6038,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#: apt.conf.5.xml:330
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -5856,7 +6052,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323 apt.conf.5.xml:387
+#: apt.conf.5.xml:340 apt.conf.5.xml:404
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -5864,7 +6060,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:343
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -5876,7 +6072,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:351
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -5886,7 +6082,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:339
+#: apt.conf.5.xml:356
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -5894,12 +6090,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:362
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:363
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -5909,7 +6105,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:352
+#: apt.conf.5.xml:369
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -5930,12 +6126,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:370 sources.list.5.xml:155
+#: apt.conf.5.xml:387 sources.list.5.xml:171
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:388
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -5954,7 +6150,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:407
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -5964,7 +6160,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:414
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -5973,7 +6169,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:419
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -5983,18 +6179,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:409 sources.list.5.xml:137
+#: apt.conf.5.xml:426 sources.list.5.xml:153
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:415
+#: apt.conf.5.xml:432
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#: apt.conf.5.xml:427
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6007,12 +6203,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:437
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:421
+#: apt.conf.5.xml:438
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6020,18 +6216,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:443
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:449
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:427
+#: apt.conf.5.xml:444
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6043,19 +6239,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:454
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:457
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:433
+#: apt.conf.5.xml:450
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6072,20 +6268,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:461
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:442
+#: apt.conf.5.xml:459
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
"will only be used if this file exists, e.g. for the bzip2 method (the "
-"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
-"that list entries specified on the command line will be added at the end of "
-"the list specified in the configuration files, but before the default "
+"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+"also that list entries specified on the command line 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 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 "
@@ -6093,20 +6289,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:466
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
"uncompressed files so this is mostly only useable for local mirrors."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:454
+#: apt.conf.5.xml:471
msgid "GzipIndexes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:473
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -6115,12 +6311,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:463
+#: apt.conf.5.xml:480
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:481
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
@@ -6133,13 +6329,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:480
+#: apt.conf.5.xml:497
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:487
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -6162,19 +6358,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:253
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:487
+#: apt.conf.5.xml:504
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:506
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6186,7 +6382,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:513
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6199,7 +6395,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:522
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6209,7 +6405,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:528
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -6217,7 +6413,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:532
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6228,7 +6424,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:540
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6241,7 +6437,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:553
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -6252,12 +6448,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:562
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:564
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6265,13 +6461,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:551
+#: apt.conf.5.xml:568
#, fuzzy
msgid "Clean"
msgstr "B<clean>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:569
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6282,51 +6478,51 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:578
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:582
#, fuzzy
msgid "Updateoptions"
msgstr "opcje"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:583
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:587
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:588
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:594
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:595
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:583
+#: apt.conf.5.xml:600
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -6334,17 +6530,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:606
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6353,12 +6549,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:612
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:613
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6368,7 +6564,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:619
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6378,37 +6574,37 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:626
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:627
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:631
#, fuzzy
msgid "Build-options"
msgstr "opcje"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:615
+#: apt.conf.5.xml:632
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:637
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:638
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiple calls of dpkg. Without further options dpkg will use triggers only "
@@ -6423,7 +6619,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:653
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6437,7 +6633,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:647
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -6451,12 +6647,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:642
+#: apt.conf.5.xml:659
msgid "DPkg::NoTriggers"
msgstr "DPkg::NoTriggers"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:660
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -6468,12 +6664,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:650
+#: apt.conf.5.xml:667
msgid "PackageManager::Configure"
msgstr "PackageManager::Configure"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:668
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -6489,12 +6685,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:678
msgid "DPkg::ConfigurePending"
msgstr "DPkg::ConfigurePending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:662
+#: apt.conf.5.xml:679
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -6505,12 +6701,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:685
msgid "DPkg::TriggersPending"
msgstr "DPkg::TriggersPending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:669
+#: apt.conf.5.xml:686
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -6520,12 +6716,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:691
msgid "PackageManager::UnpackAll"
msgstr "PackageManager::UnpackAll"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:675
+#: apt.conf.5.xml:692
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-"
@@ -6537,12 +6733,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:699
msgid "OrderList::Score::Immediate"
msgstr "OrderList::Score::Immediate"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:707
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -6560,7 +6756,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:700
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 "
@@ -6574,12 +6770,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:720
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:721
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -6588,13 +6784,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:729
#, fuzzy
msgid "Debug options"
msgstr "opcje"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:731
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -6605,7 +6801,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:742
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -6613,7 +6809,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:750
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -6621,7 +6817,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:759
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -6631,7 +6827,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:750
+#: apt.conf.5.xml:767
#, fuzzy
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
@@ -6641,104 +6837,104 @@ msgstr ""
"in CDROM IDs."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:777
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:782
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:769
+#: apt.conf.5.xml:786
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:793
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:780
+#: apt.conf.5.xml:797
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:787
+#: apt.conf.5.xml:804
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:791
+#: apt.conf.5.xml:808
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:815
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:802
+#: apt.conf.5.xml:819
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:826
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:813
+#: apt.conf.5.xml:830
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:820
+#: apt.conf.5.xml:837
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:841
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:831
+#: apt.conf.5.xml:848
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:851
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:858
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:861
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:851
+#: apt.conf.5.xml:868
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:871
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 "
@@ -6746,93 +6942,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:879
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:882
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:873
+#: apt.conf.5.xml:890
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:894
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:884
+#: apt.conf.5.xml:901
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:887
+#: apt.conf.5.xml:904
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:894
+#: apt.conf.5.xml:911
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:897
+#: apt.conf.5.xml:914
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:905
+#: apt.conf.5.xml:922
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:909
+#: apt.conf.5.xml:926
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:916
+#: apt.conf.5.xml:933
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:920
+#: apt.conf.5.xml:937
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:927
+#: apt.conf.5.xml:944
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:948
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:938
+#: apt.conf.5.xml:955
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:941
+#: apt.conf.5.xml:958
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -6842,12 +7038,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:969
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:955
+#: apt.conf.5.xml:972
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -6864,91 +7060,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:991
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:994
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:984
+#: apt.conf.5.xml:1001
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:987
+#: apt.conf.5.xml:1004
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:995
+#: apt.conf.5.xml:1012
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:998
+#: apt.conf.5.xml:1015
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:1005
+#: apt.conf.5.xml:1022
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1009
+#: apt.conf.5.xml:1026
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:1017
+#: apt.conf.5.xml:1034
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1021
+#: apt.conf.5.xml:1038
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1028
+#: apt.conf.5.xml:1045
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1032
+#: apt.conf.5.xml:1049
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1055
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1042
+#: apt.conf.5.xml:1059
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:1050
+#: apt.conf.5.xml:1067
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:1053
+#: apt.conf.5.xml:1070
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 "
@@ -6956,32 +7152,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1078
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1065
+#: apt.conf.5.xml:1082
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:1088
+#: apt.conf.5.xml:1105
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1112
msgid "&file-aptconf;"
msgstr "&file-aptconf;"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1100
+#: apt.conf.5.xml:1117
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7052,16 +7248,30 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:70
+#, fuzzy
+#| msgid ""
+#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
+#| "to add sources.list entries in separate files. The format is the same as "
+#| "for the regular <filename>sources.list</filename> file. File names need "
+#| "to end with <filename>.list</filename> and may only contain letters (a-z "
+#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
+#| "characters. Otherwise they will be silently ignored."
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
-"following naming convention: The files have no or \"<literal>pref</literal>"
-"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
"that it has ignored a file if the file doesn't match a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
"case it will be silently ignored."
msgstr ""
+"Katalog <filename>/etc/apt/sources.list.d</filename> umożliwia podzielenie "
+"pliku źródeł na osobne pliki. Format jest dokładnie taki sam, jak w "
+"przypadku zwykłego pliku <filename>sources.list</filename>. Nazwy plików w "
+"tym katalogu muszą się kończyć rozszerzeniem <filename>.list</filename> i "
+"mogą składać się tylko z liter (a-z i A-Z), cyfr (0-9), znaku podkreślenia "
+"(_), pauzy (-) i kropki (.). Inne pliki zostanÄ… zignorowane."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:79
@@ -7402,17 +7612,82 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+msgid "Package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:314
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:315
#, fuzzy
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
@@ -7422,12 +7697,12 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:319
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:320
#, fuzzy
msgid ""
"causes a version to be installed even if it does not come from the target "
@@ -7437,12 +7712,12 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:325
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:326
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -7452,12 +7727,12 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:288
+#: apt_preferences.5.xml:331
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:332
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -7467,12 +7742,12 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:337
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:338
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -7481,17 +7756,17 @@ msgstr ""
"pakietu nie jest jeszcze zainstalowana"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:342
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:343
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:309
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -7499,7 +7774,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:348
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -7508,14 +7783,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:354
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:358
#, no-wrap
msgid ""
"Package: perl\n"
@@ -7543,12 +7818,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:371
msgid "Then:"
msgstr "Wtedy:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:373
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -7558,7 +7833,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:378
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -7566,7 +7841,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:382
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -7575,12 +7850,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:392
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:394
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -7588,27 +7863,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:406
msgid "the <literal>Package:</literal> line"
msgstr "linia <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:364
+#: apt_preferences.5.xml:407
msgid "gives the package name"
msgstr "podaje nazwÄ™ pakietu"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
msgid "the <literal>Version:</literal> line"
msgstr "linia <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:411
msgid "gives the version number for the named package"
msgstr "podaje numer wersji danego pakietu"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:398
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -7621,12 +7896,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:427
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:428
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -7637,18 +7912,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:438
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:444
msgid "the <literal>Codename:</literal> line"
msgstr "linia <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:445
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -7659,14 +7934,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:454
#, fuzzy, no-wrap
#| msgid "Pin: release a=stable\n"
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:461
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -7676,7 +7951,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:470
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -7688,12 +7963,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:479
msgid "the <literal>Component:</literal> line"
msgstr "linia <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:480
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -7704,18 +7979,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:446
+#: apt_preferences.5.xml:489
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:452
+#: apt_preferences.5.xml:495
msgid "the <literal>Origin:</literal> line"
msgstr "linia <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:453
+#: apt_preferences.5.xml:496
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -7724,18 +7999,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:459
+#: apt_preferences.5.xml:502
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:465
+#: apt_preferences.5.xml:508
msgid "the <literal>Label:</literal> line"
msgstr "linia <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:509
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -7744,13 +8019,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:515
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:416
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -7764,7 +8039,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:522
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -7779,12 +8054,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:535
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:494
+#: apt_preferences.5.xml:537
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -7792,12 +8067,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:503
+#: apt_preferences.5.xml:546
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:554
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -7821,7 +8096,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -7831,8 +8106,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -7844,7 +8119,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:566
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -7853,13 +8128,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:583
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>pakiet</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:577
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -7868,12 +8143,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:589
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:555
+#: apt_preferences.5.xml:598
#, no-wrap
msgid ""
"Package: *\n"
@@ -7901,7 +8176,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:591
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -7912,7 +8187,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:612
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -7921,13 +8196,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:632
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>pakiet</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:623
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -7939,12 +8214,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:596
+#: apt_preferences.5.xml:639
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:610
+#: apt_preferences.5.xml:653
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -7978,7 +8253,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:641
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -7993,7 +8268,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:670
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -8002,13 +8277,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:647
+#: apt_preferences.5.xml:690
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>pakiet</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:681
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -8020,12 +8295,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:699
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:662
+#: apt_preferences.5.xml:705
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -8158,8 +8433,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:81
-#, no-wrap
-msgid "deb uri distribution [component1] [component2] [...]"
+#, fuzzy, no-wrap
+#| msgid "deb uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri distribution [component1] [component2] [...]"
msgstr "deb URI dystrybucja [komponent1] [komponent2] [...]"
#. type: Content of: <refentry><refsect1><para>
@@ -8232,6 +8508,38 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:112
msgid ""
+"<literal>options</literal> is always optional and needs to be surounded by "
+"square brackets. It can consist of multiple settings in the form "
+"<literal><replaceable>setting</replaceable>=<replaceable>value</"
+"replaceable></literal>. Multiple settings are separated by spaces. The "
+"following settings are supported by APT, note through that unsupported "
+"settings will be ignored silently:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:117
+msgid ""
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> can be used to specify for which architectures "
+"packages information should be downloaded. If this option is not set all "
+"architectures defined by the <literal>APT::Architectures</literal> option "
+"will be downloaded."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:128
+msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@ -8244,12 +8552,12 @@ msgstr ""
"komputerami w Internecie)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:133
msgid "Some examples:"
msgstr "Kilka przykładów:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:119
+#: sources.list.5.xml:135
#, fuzzy, no-wrap
#| msgid ""
#| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
@@ -8265,17 +8573,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:125
+#: sources.list.5.xml:141
msgid "URI specification"
msgstr "Określanie URI"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:146
msgid "file"
msgstr "file"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:132
+#: sources.list.5.xml:148
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -8286,7 +8594,7 @@ msgstr ""
"archiwów."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:155
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -8296,7 +8604,7 @@ msgstr ""
"list."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:162
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -8313,7 +8621,7 @@ msgstr ""
"bezpieczny."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:173
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -8332,12 +8640,12 @@ msgstr ""
"używające http zostaną zignorowane."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:182
msgid "copy"
msgstr "copy"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:184
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -8349,17 +8657,17 @@ msgstr ""
"skopiowania plików przy użyciu APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "rsh"
msgstr "rsh"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "ssh"
msgstr "ssh"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:191
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -8375,12 +8683,12 @@ msgstr ""
"ze zdalnego komputera."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:199
msgid "more recognizable URI types"
msgstr "więcej rozpoznawanych typów URI"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:185
+#: sources.list.5.xml:201
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
@@ -8402,7 +8710,7 @@ msgstr ""
"citerefentry>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:143
msgid ""
"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -8411,7 +8719,7 @@ msgstr ""
"ssh, rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:215
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -8420,36 +8728,59 @@ msgstr ""
"debian dla zasobów stable/main, stable/contrib i stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:203
+#: sources.list.5.xml:219
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Jak wyżej, z tą różnicą że używa dystrybucji niestabilnej (deweloperskiej)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:220
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:222
msgid "Source line for the above"
msgstr "Linie źródeł dla powyższego przykładu"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:223
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:209
+#: sources.list.5.xml:225
+msgid ""
+"The first line gets package information for the architectures in "
+"<literal>APT::Architectures</literal> while the second always retrieves "
+"<literal>amd64</literal> and <literal>armel</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:227
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
+#| "deb http://http.us.debian.org/debian dists/stable-updates/\n"
+#| " "
+msgid ""
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgstr ""
+"deb http://http.us.debian.org/debian stable main contrib non-free\n"
+"deb http://http.us.debian.org/debian dists/stable-updates/\n"
+" "
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:230
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -8458,13 +8789,13 @@ msgstr ""
"org i dystrybucji hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:211
+#: sources.list.5.xml:232
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:234
#, fuzzy
#| msgid ""
#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
@@ -8477,14 +8808,14 @@ msgstr ""
"dystrybucji stable/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:236
#, fuzzy, no-wrap
#| msgid "deb ftp://ftp.debian.org/debian stable contrib"
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian stable contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:238
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -8497,20 +8828,20 @@ msgstr ""
"to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:251
#, fuzzy, no-wrap
#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:244
#, fuzzy
#| msgid ""
#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@ -8538,7 +8869,7 @@ msgstr ""
"<placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:256
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache;, &apt-conf;"
@@ -10067,6 +10398,37 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "Które użyje pobranych uprzednio archiwów z dysku."
+#~ msgid ""
+#~ "Update the local keyring with the keyring of Debian archive keys and "
+#~ "removes from the keyring the archive keys which are no longer valid."
+#~ msgstr ""
+#~ "Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum "
+#~ "Debiana i usuwa z lokalnej składnicy nieaktualne już klucze archiwów "
+#~ "Debiana."
+
+#~ msgid "unmarkauto"
+#~ msgstr "unmarkauto"
+
+#~ msgid "<option>-h</option>"
+#~ msgstr "<option>-h</option>"
+
+#~ msgid "<option>--help</option>"
+#~ msgstr "<option>--help</option>"
+
+#
+#~ msgid "Show a short usage summary."
+#~ msgstr "Wyświetla krótkie informacje na temat użytkowania."
+
+#~ msgid "<option>-v</option>"
+#~ msgstr "<option>-v</option>"
+
+#~ msgid "<option>--version</option>"
+#~ msgstr "<option>--version</option>"
+
+#
+#~ msgid "Show the program version."
+#~ msgstr "Wyświetla wersję programu."
+
#~ msgid "<option>--md5</option>"
#~ msgstr "<option>--md5</option>"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 42862cc4e..2d053d566 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
-"POT-Creation-Date: 2011-04-05 10:22+0300\n"
+"POT-Creation-Date: 2011-11-10 16:42+0100\n"
"PO-Revision-Date: 2010-08-25 23:07+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -762,8 +762,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
msgid "Description"
@@ -783,7 +783,7 @@ msgstr ""
"a partir dos metadados do pacote."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:120
+#: apt-cache.8.xml:70 apt-get.8.xml:127
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -1279,8 +1279,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
+#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
msgid "options"
msgstr "opções"
@@ -1306,7 +1306,7 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
#: apt-sortpkgs.1.xml:61
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
@@ -1332,12 +1332,12 @@ msgstr ""
"pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
@@ -1418,9 +1418,16 @@ msgstr "<option>--no-enhances</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:317
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be twicked with these flags "
+#| "which will omit the specified dependency type. Configuration Item: "
+#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be twicked with these flags which will omit "
+"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
"Cache::ShowRecommends</literal>."
@@ -1432,7 +1439,7 @@ msgstr ""
"ex. <literal>APT::Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
+#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
msgid "<option>-f</option>"
msgstr "<option>-f</option>"
@@ -1451,7 +1458,8 @@ msgstr ""
"<literal>APT::Cache::ShowFull</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+#: apt-get.8.xml:452
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
@@ -1568,14 +1576,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:596
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
+#: apt-cache.8.xml:372 apt-get.8.xml:601 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt.conf.5.xml:1110 apt_preferences.5.xml:697
msgid "Files"
msgstr "Ficheiros"
@@ -1586,10 +1594,10 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
-#: sources.list.5.xml:234
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:611
+#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
msgid "See Also"
msgstr "Veja também"
@@ -1600,8 +1608,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:617
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr "Diagnóstico"
@@ -1730,12 +1738,12 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:161
msgid "Options"
msgstr "Opções"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
@@ -1779,7 +1787,7 @@ msgstr ""
"CDROM::Rename</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:364
+#: apt-cdrom.8.xml:116 apt-get.8.xml:375
msgid "<option>-m</option>"
msgstr "<option>-m</option>"
@@ -1834,17 +1842,17 @@ msgstr ""
"estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:395
+#: apt-cdrom.8.xml:143 apt-get.8.xml:406
msgid "<option>--just-print</option>"
msgstr "<option>--just-print</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:397
+#: apt-cdrom.8.xml:144 apt-get.8.xml:408
msgid "<option>--recon</option>"
msgstr "<option>--recon</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:398
+#: apt-cdrom.8.xml:145 apt-get.8.xml:409
msgid "<option>--no-act</option>"
msgstr "<option>--no-act</option>"
@@ -1988,7 +1996,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Apenas mostra o conteúdo do espaço de configuração."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
#: apt-sortpkgs.1.xml:73
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2067,7 +2075,7 @@ msgstr ""
"configuração.XXXX</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
+#: apt-extracttemplates.1.xml:63 apt-get.8.xml:530
msgid "<option>-t</option>"
msgstr "<option>-t</option>"
@@ -2344,7 +2352,7 @@ msgstr ""
"definições requeridas."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:287
+#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
msgid "clean"
msgstr "clean"
@@ -2910,8 +2918,8 @@ msgstr ""
"distribuição, tipicamente isto é algo como <literal>main contrib non-free</"
"literal>"
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
msgid "Architectures"
msgstr "Architectures"
@@ -3153,10 +3161,10 @@ msgid ""
"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
"replaceable>::<replaceable>Checksum</replaceable></literal> where "
-"<literal>Index</literal> can be <literal>Packages</literal>, "
-"<literal>Sources</literal> or <literal>Release</literal> and "
-"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
-"literal> or <literal>SHA256</literal>."
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
msgstr ""
"Valores para os campos de metadados adicionais no ficheiro Release são "
"tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::"
@@ -3168,12 +3176,12 @@ msgstr ""
"<literal>Description</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:539
+#: apt-ftparchive.1.xml:540
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3182,7 +3190,7 @@ msgstr ""
"generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:547
+#: apt-ftparchive.1.xml:548
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3196,12 +3204,12 @@ msgstr ""
"<literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:556
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3214,12 +3222,12 @@ msgstr ""
"option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3235,12 +3243,12 @@ msgstr ""
"de Configuração: <literal>APT::FTPArchive::Contents</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:571
+#: apt-ftparchive.1.xml:572
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3251,12 +3259,12 @@ msgstr ""
"SourceOverride</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:578
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:580
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3265,12 +3273,12 @@ msgstr ""
"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:584
msgid "<option>--arch</option>"
msgstr "<option>--arch</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:585
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3284,12 +3292,12 @@ msgstr ""
"FTPArchive::Architecture</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:590
+#: apt-ftparchive.1.xml:591
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -3313,12 +3321,12 @@ msgstr ""
"as verificações extras serão desnecessárias."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:602
+#: apt-ftparchive.1.xml:603
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:605
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3333,19 +3341,19 @@ msgstr ""
"<filename>Translation-en</filename> só pode ser criado no comando generate."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
-#: sources.list.5.xml:198
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
msgid "Examples"
msgstr "Examples"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:618
+#: apt-ftparchive.1.xml:619
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3354,7 +3362,7 @@ msgstr ""
"pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:632
+#: apt-ftparchive.1.xml:633
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3386,15 +3394,45 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-get.8.xml:39
+#, fuzzy
+#| msgid ""
+#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
+#| "<arg> <option>-t=</option> <arg choice='plain'> "
+#| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+#| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+#| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
+#| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#| "<group choice='req'> <arg choice='plain'> "
+#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#| "help</arg> </group> </arg> </group>"
msgid ""
"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <group choice=\"req\"> <arg "
-"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
-"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
-"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
+"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
+"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
+"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
+"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
+"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
@@ -3443,7 +3481,7 @@ msgstr ""
"</group> </arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:115
+#: apt-get.8.xml:122
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
@@ -3456,12 +3494,12 @@ msgstr ""
"\"front-end\" como o &dselect;, &aptitude;, &synaptic; e &wajig;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:124 apt-key.8.xml:127
+#: apt-get.8.xml:131 apt-key.8.xml:127
msgid "update"
msgstr "update"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:132
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources. The indexes of available packages are fetched from the "
@@ -3485,12 +3523,12 @@ msgstr ""
"ficheiros de pacotes não pode ser conhecido com antecedência."
#. type: <tag></tag>
-#: apt-get.8.xml:136 guide.sgml:121
+#: apt-get.8.xml:143 guide.sgml:121
msgid "upgrade"
msgstr "upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:137
+#: apt-get.8.xml:144
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -3516,12 +3554,12 @@ msgstr ""
"novas versões de pacotes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:149
+#: apt-get.8.xml:156
msgid "dselect-upgrade"
msgstr "dselect-upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:150
+#: apt-get.8.xml:157
msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3537,12 +3575,12 @@ msgstr ""
"estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)."
#. type: <tag></tag>
-#: apt-get.8.xml:159 guide.sgml:140
+#: apt-get.8.xml:166 guide.sgml:140
msgid "dist-upgrade"
msgstr "dist-upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:167
msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3566,12 +3604,12 @@ msgstr ""
"sobrepor as definições gerais em pacotes individuais."
#. type: <tag></tag>
-#: apt-get.8.xml:172 guide.sgml:131
+#: apt-get.8.xml:179 guide.sgml:131
msgid "install"
msgstr "install"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:181
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
@@ -3599,7 +3637,7 @@ msgstr ""
"decisões feitas pelo sistema de resolução de conflitos do apt-get."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:199
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -3616,7 +3654,7 @@ msgstr ""
"versão da distribuição ou o nome de Arquivo (stable, testing, unstable)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:206
msgid ""
"Both of the version selection mechanisms can downgrade packages and must be "
"used with care."
@@ -3625,7 +3663,7 @@ msgstr ""
"e devem ser usados com cuidado."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:202
+#: apt-get.8.xml:209
msgid ""
"This is also the target to use if you want to upgrade one or more already-"
"installed packages without upgrading every package you have on your system. "
@@ -3645,7 +3683,7 @@ msgstr ""
"descarregadas e instaladas."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:220
msgid ""
"Finally, the &apt-preferences; mechanism allows you to create an alternative "
"installation policy for individual packages."
@@ -3654,7 +3692,7 @@ msgstr ""
"instalação alternativa para pacotes individuais."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:224
msgid ""
"If no package matches the given expression and the expression contains one "
"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3673,12 +3711,12 @@ msgstr ""
"caractere '^' ou '$', para criar uma expressão regular mais específica."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:233
msgid "remove"
msgstr "remove"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:227
+#: apt-get.8.xml:234
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note the removing a package "
@@ -3693,12 +3731,12 @@ msgstr ""
"pacote identificado será instalado em vez de removido."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:241
msgid "purge"
msgstr "purge"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:235
+#: apt-get.8.xml:242
msgid ""
"<literal>purge</literal> is identical to <literal>remove</literal> except "
"that packages are removed and purged (any configuration files are deleted "
@@ -3709,12 +3747,12 @@ msgstr ""
"configuração são também apagados)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:246
msgid "source"
msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:240
+#: apt-get.8.xml:247
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -3733,7 +3771,7 @@ msgstr ""
"<literal>pkg/release</literal>, se possível."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:248
+#: apt-get.8.xml:255
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
"src</literal> type lines in the &sources-list; file. This means that you "
@@ -3749,12 +3787,19 @@ msgstr ""
"instalada ou pode instalar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:262
+#, fuzzy
+#| msgid ""
+#| "If the <option>--compile</option> option is specified then the package "
+#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+#| "command>, if <option>--download-only</option> is specified then the "
+#| "source package will not be unpacked."
msgid ""
"If the <option>--compile</option> option is specified then the package will "
-"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
-"<option>--download-only</option> is specified then the source package will "
-"not be unpacked."
+"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+"the architecture as defined by the <command>--host-architecture</command> "
+"option. If <option>--download-only</option> is specified then the source "
+"package will not be unpacked."
msgstr ""
"Se for especificada a opção <option>--compile</option> então o pacote irá "
"ser compilado para um binário .deb usando <command>dpkg-buildpackage</"
@@ -3762,7 +3807,7 @@ msgstr ""
"pacote fonte não será desempacotado."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:260
+#: apt-get.8.xml:269
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -3777,7 +3822,7 @@ msgstr ""
"Only-Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:275
msgid ""
"Note that source packages are not tracked like binary packages, they exist "
"only in the current directory and are similar to downloading source tar "
@@ -3788,26 +3833,33 @@ msgstr ""
"balls fonte."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:280
msgid "build-dep"
msgstr "build-dep"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:281
+#, fuzzy
+#| msgid ""
+#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+#| "an attempt to satisfy the build dependencies for a source package."
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
-"attempt to satisfy the build dependencies for a source package."
+"attempt to satisfy the build dependencies for a source package. By default "
+"the dependencies are satisfied to build the package nativly. If desired a "
+"host-architecture can be specified with the <option>--host-architecture</"
+"option> option instead."
msgstr ""
"<literal>build-dep</literal> faz o apt-get instalar/remover pacotes numa "
"tentativa de satisfazer dependências de compilação para um pacote fonte."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:276
+#: apt-get.8.xml:287
msgid "check"
msgstr "check"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:288
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
@@ -3816,19 +3868,19 @@ msgstr ""
"de pacotes e verifica por dependências quebradas."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:292
msgid "download"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:293
msgid ""
"<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:299
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -3847,12 +3899,12 @@ msgstr ""
"libertar espaço do disco."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid "autoclean"
msgstr "autoclean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:298
+#: apt-get.8.xml:309
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -3871,28 +3923,33 @@ msgstr ""
"pacotes instalados sejam apagados se estiver definida para 'off'."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:307
+#: apt-get.8.xml:318
msgid "autoremove"
msgstr "autoremove"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:319
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for some package and that "
+#| "are no more needed."
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for some package and that "
-"are no more needed."
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
msgstr ""
"<literal>autoremove</literal> é usado para remover pacotes que foram "
"instalados automaticamente para satisfazer dependências de algum pacote e "
"que já não são necessários."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:323
msgid "changelog"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:324
msgid ""
"<literal>changelog</literal> downloads a package changelog and displays it "
"through <command>sensible-pager</command>. The server name and base "
@@ -3905,12 +3962,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:335
+#: apt-get.8.xml:346
msgid "<option>--no-install-recommends</option>"
msgstr "<option>--no-install-recommends</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:336
+#: apt-get.8.xml:347
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3919,14 +3976,14 @@ msgstr ""
"de Configuração: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:340
+#: apt-get.8.xml:351
#, fuzzy
#| msgid "<option>--no-suggests</option>"
msgid "<option>--install-suggests</option>"
msgstr "<option>--no-suggests</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:341
+#: apt-get.8.xml:352
#, fuzzy
#| msgid ""
#| "Do not consider recommended packages as a dependency for installing. "
@@ -3939,12 +3996,12 @@ msgstr ""
"de Configuração: <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:356
msgid "<option>--download-only</option>"
msgstr "<option>--download-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:357
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -3954,12 +4011,12 @@ msgstr ""
"Download-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:350
+#: apt-get.8.xml:361
msgid "<option>--fix-broken</option>"
msgstr "<option>--fix-broken</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:362
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -3987,17 +4044,17 @@ msgstr ""
"<literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:375
msgid "<option>--ignore-missing</option>"
msgstr "<option>--ignore-missing</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:365
+#: apt-get.8.xml:376
msgid "<option>--fix-missing</option>"
msgstr "<option>--fix-missing</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:366
+#: apt-get.8.xml:377
msgid ""
"Ignore missing packages; If packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -4016,12 +4073,12 @@ msgstr ""
"de Configuração: <literal>APT::Get::Fix-Missing</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:387
msgid "<option>--no-download</option>"
msgstr "<option>--no-download</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:388
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -4032,7 +4089,7 @@ msgstr ""
"descarregados. Item de Configuração: <literal>APT::Get::Download</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:384
+#: apt-get.8.xml:395
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4052,17 +4109,17 @@ msgstr ""
"<literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:405
msgid "<option>--simulate</option>"
msgstr "<option>--simulate</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:407
msgid "<option>--dry-run</option>"
msgstr "<option>--dry-run</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:410
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -4073,7 +4130,7 @@ msgstr ""
"Simulate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:414
msgid ""
"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
"literal>) automatic. Also a notice will be displayed indicating that this "
@@ -4091,7 +4148,7 @@ msgstr ""
"get</literal>)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:420
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4104,22 +4161,22 @@ msgstr ""
"vazios significam quebras que não têm consequência (raro)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>-y</option>"
msgstr "<option>-y</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>--yes</option>"
msgstr "<option>--yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:417
+#: apt-get.8.xml:428
msgid "<option>--assume-yes</option>"
msgstr "<option>--assume-yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:418
+#: apt-get.8.xml:429
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -4135,17 +4192,37 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:436
+#, fuzzy
+#| msgid "<option>--assume-yes</option>"
+msgid "<option>--assume-no</option>"
+msgstr "<option>--assume-yes</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:437
+#, fuzzy
+#| msgid ""
+#| "Compile source packages after downloading them. Configuration Item: "
+#| "<literal>APT::Get::Compile</literal>."
+msgid ""
+"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+"Compila pacotes fonte após os descarregar. Item de Configuração: "
+"<literal>APT::Get::Compile</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:441
msgid "<option>-u</option>"
msgstr "<option>-u</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:441
msgid "<option>--show-upgraded</option>"
msgstr "<option>--show-upgraded</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:442
msgid ""
"Show upgraded packages; Print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4155,17 +4232,17 @@ msgstr ""
"Upgraded</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>-V</option>"
msgstr "<option>-V</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>--verbose-versions</option>"
msgstr "<option>--verbose-versions</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:448
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -4174,22 +4251,40 @@ msgstr ""
"Configuração: <literal>APT::Get::Show-Versions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:453
+#, fuzzy
+#| msgid "<option>--recurse</option>"
+msgid "<option>--host-architecture</option>"
+msgstr "<option>--recurse</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:454
+msgid ""
+"This option controls the architecture packages are built for by <command>apt-"
+"get source --compile</command> and how cross-builddependencies are "
+"satisfied. By default is not set which means that the host architecture is "
+"the same as the build architecture (which is defined by <literal>APT::"
+"Architecture</literal>) Configuration Item: <literal>APT::Get::Host-"
+"Architecture</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:462
msgid "<option>-b</option>"
msgstr "<option>-b</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:462
msgid "<option>--compile</option>"
msgstr "<option>--compile</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:463
msgid "<option>--build</option>"
msgstr "<option>--build</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:464
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -4198,12 +4293,12 @@ msgstr ""
"<literal>APT::Get::Compile</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:468
msgid "<option>--ignore-hold</option>"
msgstr "<option>--ignore-hold</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:469
msgid ""
"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -4216,12 +4311,12 @@ msgstr ""
"Item de Configuração: <literal>APT::Ignore-Hold</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:475
msgid "<option>--no-upgrade</option>"
msgstr "<option>--no-upgrade</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:450
+#: apt-get.8.xml:476
msgid ""
"Do not upgrade packages; When used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4234,12 +4329,12 @@ msgstr ""
"Configuração: <literal>APT::Get::Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:482
msgid "<option>--only-upgrade</option>"
msgstr "<option>--only-upgrade</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:483
msgid ""
"Do not install new packages; When used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -4252,12 +4347,12 @@ msgstr ""
"de Configuração: <literal>APT::Get::Only-Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:489
msgid "<option>--force-yes</option>"
msgstr "<option>--force-yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:490
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -4272,12 +4367,12 @@ msgstr ""
"<literal>APT::Get::force-yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:497
msgid "<option>--print-uris</option>"
msgstr "<option>--print-uris</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:498
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -4298,12 +4393,12 @@ msgstr ""
"Configuração: <literal>APT::Get::Print-URIs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:508
msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:509
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4316,12 +4411,12 @@ msgstr ""
"option>. Item de Configuração: <literal>APT::Get::Purge</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:516
msgid "<option>--reinstall</option>"
msgstr "<option>--reinstall</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:517
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4330,12 +4425,12 @@ msgstr ""
"Configuração: <literal>APT::Get::ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:495
+#: apt-get.8.xml:521
msgid "<option>--list-cleanup</option>"
msgstr "<option>--list-cleanup</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:522
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -4352,17 +4447,17 @@ msgstr ""
"fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:505
+#: apt-get.8.xml:531
msgid "<option>--target-release</option>"
msgstr "<option>--target-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:532
msgid "<option>--default-release</option>"
msgstr "<option>--default-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:533
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -4385,12 +4480,12 @@ msgstr ""
"Release</literal>; veja também o manual &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:546
msgid "<option>--trivial-only</option>"
msgstr "<option>--trivial-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:522
+#: apt-get.8.xml:548
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4404,12 +4499,12 @@ msgstr ""
"Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:554
msgid "<option>--no-remove</option>"
msgstr "<option>--no-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:555
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4419,12 +4514,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:534
+#: apt-get.8.xml:560
msgid "<option>--auto-remove</option>"
msgstr "<option>--auto-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:561
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4437,12 +4532,12 @@ msgstr ""
"Configuração: <literal>APT::Get::AutomaticRemove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:567
msgid "<option>--only-source</option>"
msgstr "<option>--only-source</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:568
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -4461,22 +4556,22 @@ msgstr ""
"<literal>APT::Get::Only-Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--diff-only</option>"
msgstr "<option>--diff-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--dsc-only</option>"
msgstr "<option>--dsc-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--tar-only</option>"
msgstr "<option>--tar-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:553
+#: apt-get.8.xml:579
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4487,12 +4582,12 @@ msgstr ""
"Only</literal>, e <literal>APT::Get::Tar-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:558
+#: apt-get.8.xml:584
msgid "<option>--arch-only</option>"
msgstr "<option>--arch-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:585
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -4501,12 +4596,12 @@ msgstr ""
"de Configuração: <literal>APT::Get::Arch-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:589
msgid "<option>--allow-unauthenticated</option>"
msgstr "<option>--allow-unauthenticated</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:564
+#: apt-get.8.xml:590
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -4517,7 +4612,7 @@ msgstr ""
"Get::AllowUnauthenticated</literal>."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:603
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
@@ -4526,7 +4621,7 @@ msgstr ""
"&file-statelists;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:612
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4537,7 +4632,7 @@ msgstr ""
"&guidesdir;, &apt-preferences;, o Howto do APT."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:618
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -4546,22 +4641,22 @@ msgstr ""
"erro."
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:595
+#: apt-get.8.xml:621
msgid "ORIGINAL AUTHORS"
msgstr "AUTORES ORIGINAIS"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:596
+#: apt-get.8.xml:622
msgid "&apt-author.jgunthorpe;"
msgstr "&apt-author.jgunthorpe;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:599
+#: apt-get.8.xml:625
msgid "CURRENT AUTHORS"
msgstr "AUTORES ACTUAIS"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:601
+#: apt-get.8.xml:627
msgid "&apt-author.team;"
msgstr "&apt-author.team;"
@@ -4688,14 +4783,33 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:131
msgid ""
-"Update the local keyring with the keyring of Debian archive keys and removes "
-"from the keyring the archive keys which are no longer valid."
+"Update the local keyring with the archive keyring and remove from the local "
+"keyring the archive keys which are no longer valid. The archive keyring is "
+"shipped in the <literal>archive-keyring</literal> package of your "
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:141
+#, fuzzy
+#| msgid "update"
+msgid "net-update"
+msgstr "update"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:145
+msgid ""
+"Work similar to the <command>update</command> command above, but get the "
+"archive keyring from an URI instead and validate it against a master key. "
+"This requires an installed &wget; and an APT build configured to have a "
+"server to fetch from and a master keyring to validate. APT in Debian does "
+"not support this command and relies on <command>update</command> instead, "
+"but Ubuntu's APT does."
msgstr ""
-"Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e "
-"remove do chaveiro as chaves de arquivo que já não são válidas."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:162
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
@@ -4704,12 +4818,12 @@ msgstr ""
"secção prévia."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:164
msgid "--keyring <replaceable>filename</replaceable>"
msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:165
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -4726,53 +4840,66 @@ msgstr ""
"chaves são adicionadas a este."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:178
msgid "&file-trustedgpg;"
msgstr "&file-trustedgpg;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:180
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:181
msgid "Local trust database of archive keys."
msgstr "Base de dados local de confiança de chaves de arquivos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#: apt-key.8.xml:184
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
-msgid "Keyring of Debian archive trusted keys."
+#: apt-key.8.xml:185
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Chaveiro das chaves de confiança dos arquivos Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:188
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
-msgid "Keyring of Debian archive removed trusted keys."
+#: apt-key.8.xml:189
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:198
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
+#, fuzzy
+#| msgid ""
+#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+#| "August 2009</date>"
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
msgstr ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
"Agosto 2009</date>"
@@ -4789,13 +4916,22 @@ msgstr "marca/desmarca um pacote como sendo instalado automaticamente"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:39
+#, fuzzy
+#| msgid ""
+#| " <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
+#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
msgstr ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>NOME DE FICHEIRO</replaceable></option></arg> <group choice="
@@ -4805,7 +4941,7 @@ msgstr ""
"arg> <arg choice=\"plain\">showauto</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
@@ -4814,7 +4950,7 @@ msgstr ""
"sendo instalado automaticamente."
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4830,14 +4966,21 @@ msgstr ""
"command> ou <command>aptitude</command> (exemplos)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+#, fuzzy
+#| msgid "markauto"
+msgid "auto"
msgstr "markauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
+#, fuzzy
+#| msgid ""
+#| "<literal>markauto</literal> is used to mark a package as being "
+#| "automatically installed, which will cause the package to be removed when "
+#| "no more manually installed packages depend on this package."
msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
@@ -4846,14 +4989,19 @@ msgstr ""
"nenhum pacote instalado manualmente depender deste pacote."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
-msgstr "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
+msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
+#, fuzzy
+#| msgid ""
+#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
@@ -4862,21 +5010,95 @@ msgstr ""
"automaticamente se nenhum outro pacote depender dele."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
+#: apt-mark.8.xml:85
+msgid "hold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:86
+msgid ""
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed. The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:96
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
+"instalados automaticamente com cada pacote numa linha nova."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:101
msgid "showauto"
msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:102
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"installed packages with each package on a new line. All automatically "
+"installed packages will be listed if no package is given. If packages are "
+"given only those which are automatically installed will be shown."
msgstr ""
"<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
"instalados automaticamente com cada pacote numa linha nova."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:109
+#, fuzzy
+#| msgid "showauto"
+msgid "showmanual"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:116
+#, fuzzy
+#| msgid "showauto"
+msgid "showhold"
+msgstr "showauto"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:117
+#, fuzzy
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
+"instalados automaticamente com cada pacote numa linha nova."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:130
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
@@ -4884,7 +5106,7 @@ msgstr ""
"option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:131
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -4893,7 +5115,7 @@ msgstr ""
"filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:134
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -4905,48 +5127,18 @@ msgstr ""
"localização predefinida, a qual é <filename>extended_status</filename> no "
"directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
-msgstr "<option>-h</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
-msgstr "<option>--help</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
-msgstr "Mostra um curto sumário de utilização."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
-msgstr "<option>-v</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
-msgstr "<option>--version</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
-msgstr "Mostra a versão do programa."
-
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
msgid " &file-extended_states;"
msgstr " &file-extended_states;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-get;,&aptitude;,&apt-conf;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -5420,11 +5612,12 @@ msgstr ""
#| "period (.) characters - otherwise they will be silently ignored."
msgid ""
"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
-"order which have no or \"<literal>conf</literal>\" as filename extension and "
-"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
-"characters. Otherwise APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters. Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
msgstr ""
"todos os ficheiros em <literal>Dir::Etc::Parts</literal> em ordem ascendente "
"alfanumérica sem extensão ou com \"<literal>conf</literal>\" como extensão "
@@ -5678,13 +5871,24 @@ msgstr ""
"analisa listas de pacotes. A predefinição interna é a arquitectura para a "
"qual o APT foi compilado."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:158
+msgid ""
+"All Architectures the system supports. Processors implementing the "
+"<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
+"<literal>i386</literal>; This list is use when fetching files and parsing "
+"package lists. The internal default is always the native architecture "
+"(<literal>APT::Architecture</literal>) and all foreign architectures it can "
+"retrieve by calling <command>dpkg --print-foreign-architectures</command>."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:165
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:166
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5697,12 +5901,12 @@ msgstr ""
"'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:171
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:164
+#: apt.conf.5.xml:172
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -5711,12 +5915,12 @@ msgstr ""
"os pacotes segurados sejam ignorados na sua decisão de marcação."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:176
msgid "Clean-Installed"
msgstr "Clean-Installed"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:177
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -5730,12 +5934,12 @@ msgstr ""
"directo de os reinstalar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:175
+#: apt.conf.5.xml:183
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:176
+#: apt.conf.5.xml:184
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -5799,12 +6003,12 @@ msgstr ""
"correcção do processo de actualização."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:198
+#: apt.conf.5.xml:206
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:207
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -5821,12 +6025,12 @@ msgstr ""
"tar, gzip, libc, dpkg, bash ou qualquer coisa de que estes dependem."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:215
msgid "Cache-Start, Cache-Grow and Cache-Limit"
msgstr "Cache-Start, Cache-Grow e Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
+#: apt.conf.5.xml:216
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
@@ -5863,24 +6067,24 @@ msgstr ""
"da cache é desactivado."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:223
+#: apt.conf.5.xml:231
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:232
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
"Define quais pacote(s) são considerados dependências essenciais de "
"compilação."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:235
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:236
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -5889,12 +6093,12 @@ msgstr ""
"documentação para mais informação acerca das opções daqui."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:240
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:241
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -5903,12 +6107,12 @@ msgstr ""
"documentação para mais informação acerca das opções daqui."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:245
msgid "CDROM"
msgstr "CDROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:238
+#: apt.conf.5.xml:246
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -5917,17 +6121,17 @@ msgstr ""
"documentação para mais informação acerca das opções de aqui."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:244
+#: apt.conf.5.xml:252
msgid "The Acquire Group"
msgstr "O Grupo Acquire"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:249
+#: apt.conf.5.xml:257
msgid "Check-Valid-Until"
msgstr "Check-Valid-Until"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:250
+#: apt.conf.5.xml:258
msgid ""
"Security related option defaulting to true as an expiring validation for a "
"Release file prevents longtime replay attacks and can e.g. also help users "
@@ -5948,22 +6152,68 @@ msgstr ""
"ValidTime</literal> seguinte."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:260
+#: apt.conf.5.xml:268
msgid "Max-ValidTime"
msgstr "Max-ValidTime"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:261
-msgid ""
-"Seconds the Release file should be considered valid after it was created. "
-"The default is \"for ever\" (0) if the Release file of the archive doesn't "
-"include a <literal>Valid-Until</literal> header. If it does then this date "
-"is the default. The date from the Release file or the date specified by the "
-"creation time of the Release file (<literal>Date</literal> header) plus the "
-"seconds specified with this options are used to check if the validation of a "
-"file has expired by using the earlier date of the two. Archive specific "
-"settings can be made by appending the label of the archive to the option "
-"name."
+#: apt.conf.5.xml:269
+#, fuzzy
+#| msgid ""
+#| "Seconds the Release file should be considered valid after it was created. "
+#| "The default is \"for ever\" (0) if the Release file of the archive "
+#| "doesn't include a <literal>Valid-Until</literal> header. If it does then "
+#| "this date is the default. The date from the Release file or the date "
+#| "specified by the creation time of the Release file (<literal>Date</"
+#| "literal> header) plus the seconds specified with this options are used to "
+#| "check if the validation of a file has expired by using the earlier date "
+#| "of the two. Archive specific settings can be made by appending the label "
+#| "of the archive to the option name."
+msgid ""
+"Seconds the Release file should be considered valid after it was created "
+"(indicated by the <literal>Date</literal> header). If the Release file "
+"itself includes a <literal>Valid-Until</literal> header the earlier date of "
+"the two is used as the expiration date. The default value is <literal>0</"
+"literal> which stands for \"for ever\". Archive specific settings can be "
+"made by appending the label of the archive to the option name."
+msgstr ""
+"Segundos em que o ficheiro Release deve considerado válido após ser criado. "
+"A predefinição é \"para sempre\" (0) se o ficheiro Release do arquivo não "
+"conter um cabeçalho <literal>Valid-Until</literal>. Se o tiver então esta "
+"data é a predefinida. A data do ficheiro Release ou a data especificada pela "
+"hora de criação do do ficheiro Release (cabeçalho <literal>Date</literal>) "
+"mais os segundos especificados com esta opção são usados para verificar se a "
+"validação de um ficheiro já expirou ao usar uma data anterior às duas. "
+"Definições específicas do Arquivo podem ser feitas ao adicionar a etiqueta "
+"do arquivo ao nome da opção. "
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:279
+#, fuzzy
+#| msgid "Max-ValidTime"
+msgid "Min-ValidTime"
+msgstr "Max-ValidTime"
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
+#, fuzzy
+#| msgid ""
+#| "Seconds the Release file should be considered valid after it was created. "
+#| "The default is \"for ever\" (0) if the Release file of the archive "
+#| "doesn't include a <literal>Valid-Until</literal> header. If it does then "
+#| "this date is the default. The date from the Release file or the date "
+#| "specified by the creation time of the Release file (<literal>Date</"
+#| "literal> header) plus the seconds specified with this options are used to "
+#| "check if the validation of a file has expired by using the earlier date "
+#| "of the two. Archive specific settings can be made by appending the label "
+#| "of the archive to the option name."
+msgid ""
+"Minimum of seconds the Release file should be considered valid after it was "
+"created (indicated by the <literal>Date</literal> header). Use this if you "
+"need to use a seldomly updated (local) mirror of a more regular updated "
+"archive with a <literal>Valid-Until</literal> header instead of competely "
+"disabling the expiration date checking. Archive specific settings can and "
+"should be used by appending the label of the archive to the option name."
msgstr ""
"Segundos em que o ficheiro Release deve considerado válido após ser criado. "
"A predefinição é \"para sempre\" (0) se o ficheiro Release do arquivo não "
@@ -5976,12 +6226,12 @@ msgstr ""
"do arquivo ao nome da opção. "
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:290
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:274
+#: apt.conf.5.xml:291
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -5991,12 +6241,20 @@ msgstr ""
"predefinição."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:294
+#, fuzzy
+#| msgid ""
+#| "Two sub-options to limit the use of PDiffs are also available: With "
+#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
+#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+#| "other hand is the maximum percentage of the size of all patches compared "
+#| "to the size of the targeted file. If one of these limits is exceeded the "
+#| "complete file is downloaded instead of the patches."
msgid ""
"Two sub-options to limit the use of PDiffs are also available: With "
"<literal>FileLimit</literal> can be specified how many PDiff files are "
"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum precentage of the size of all patches compared to "
+"other hand is the maximum percentage of the size of all patches compared to "
"the size of the targeted file. If one of these limits is exceeded the "
"complete file is downloaded instead of the patches."
msgstr ""
@@ -6008,12 +6266,12 @@ msgstr ""
"limites for excedido, é descarregado o ficheiro completo em vez das patches."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:303
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:304
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6028,12 +6286,12 @@ msgstr ""
"aberta uma ligação por tipo de URI."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:311
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#: apt.conf.5.xml:312
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6042,12 +6300,12 @@ msgstr ""
"tentar, no número fornecido de vezes, obter ficheiros falhados."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:299
+#: apt.conf.5.xml:316
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:300
+#: apt.conf.5.xml:317
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6057,12 +6315,12 @@ msgstr ""
"A predefinição é verdadeiro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304 sources.list.5.xml:144
+#: apt.conf.5.xml:321 sources.list.5.xml:160
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:322
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6079,7 +6337,7 @@ msgstr ""
"especificada, será usada a variável de ambiente <envar>http_proxy</envar>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#: apt.conf.5.xml:330
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6104,7 +6362,7 @@ msgstr ""
"suporta nenhuma destas opções."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323 apt.conf.5.xml:387
+#: apt.conf.5.xml:340 apt.conf.5.xml:404
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6115,7 +6373,7 @@ msgstr ""
"e tempos limite de dados."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:343
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -6134,7 +6392,7 @@ msgstr ""
"As máquinas que requerem isto estão em violação de RFC 2068."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:351
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6149,7 +6407,7 @@ msgstr ""
"múltiplos servidores ao mesmo tempo.)"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:339
+#: apt.conf.5.xml:356
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -6161,12 +6419,12 @@ msgstr ""
"identificador conhecido."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:362
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:363
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -6181,7 +6439,7 @@ msgstr ""
"literal> ainda não é suportada."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:352
+#: apt.conf.5.xml:369
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6218,12 +6476,12 @@ msgstr ""
"host&gt;::SslForceVersion</literal> é a opção po máquina correspondente."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:370 sources.list.5.xml:155
+#: apt.conf.5.xml:387 sources.list.5.xml:171
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:388
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6256,7 +6514,7 @@ msgstr ""
"$(SITE_PORT)</literal>. Cada uma é tirada do seu componente URI respectivo."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:407
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -6272,7 +6530,7 @@ msgstr ""
"específica (Veja a amostra de ficheiro de configuração para exemplos)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:414
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6286,7 +6544,7 @@ msgstr ""
"eficiência."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:419
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6301,18 +6559,18 @@ msgstr ""
"ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:409 sources.list.5.xml:137
+#: apt.conf.5.xml:426 sources.list.5.xml:153
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:415
+#: apt.conf.5.xml:432
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#: apt.conf.5.xml:427
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6333,12 +6591,12 @@ msgstr ""
"Comandos para desmontar podem ser especificados usando UMount."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:437
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:421
+#: apt.conf.5.xml:438
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6349,18 +6607,18 @@ msgstr ""
"passadas ao gpgv."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:443
msgid "CompressionTypes"
msgstr "CompressionTypes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:449
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr "Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> \"<replaceable>Nome de método</replaceable>\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:427
+#: apt.conf.5.xml:444
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6379,19 +6637,19 @@ msgstr ""
"alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:454
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:457
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:433
+#: apt.conf.5.xml:450
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6422,13 +6680,13 @@ msgstr ""
"lista pois será adicionado automaticamente."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:461
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:442
+#: apt.conf.5.xml:459
#, fuzzy
#| msgid ""
#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
@@ -6445,9 +6703,9 @@ msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
"will only be used if this file exists, e.g. for the bzip2 method (the "
-"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
-"that list entries specified on the command line will be added at the end of "
-"the list specified in the configuration files, but before the default "
+"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+"also that list entries specified on the command line 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 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 "
@@ -6465,20 +6723,20 @@ msgstr ""
"sobrepor a lista definida, irá apenas prefixar a lista com este tipo."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:466
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
"uncompressed files so this is mostly only useable for local mirrors."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:454
+#: apt.conf.5.xml:471
msgid "GzipIndexes"
msgstr "GzipIndexes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:473
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -6491,12 +6749,12 @@ msgstr ""
"CPU quando constrói as caches de pacotes locais. Falso por predefinição."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:463
+#: apt.conf.5.xml:480
msgid "Languages"
msgstr "Languages"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:481
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
@@ -6518,13 +6776,13 @@ msgstr ""
"de definir aqui valores impossíveis."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:480
+#: apt.conf.5.xml:497
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:487
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -6564,7 +6822,7 @@ msgstr ""
"ser \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:253
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6573,12 +6831,12 @@ msgstr ""
"e os manipuladores de URI. <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:487
+#: apt.conf.5.xml:504
msgid "Directories"
msgstr "Directories"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:506
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6597,7 +6855,7 @@ msgstr ""
"com <filename>/</filename> ou <filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:513
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6618,7 +6876,7 @@ msgstr ""
"literal> o directório predefinido é contido em <literal>Dir::Cache</literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:522
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6633,7 +6891,7 @@ msgstr ""
"ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:528
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -6644,7 +6902,7 @@ msgstr ""
"estar feito então é carregado o ficheiro de configuração principal."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:532
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6662,7 +6920,7 @@ msgstr ""
"respectivos programas."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:540
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6683,7 +6941,7 @@ msgstr ""
"procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:553
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -6701,12 +6959,12 @@ msgstr ""
"expressão regular."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:562
msgid "APT in DSelect"
msgstr "APT em DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:564
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6717,12 +6975,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:551
+#: apt.conf.5.xml:568
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:569
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6739,7 +6997,7 @@ msgstr ""
"descarregar novos pacotes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:578
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6748,12 +7006,12 @@ msgstr ""
"comandos quando é corrido para a fase de instalação."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:582
msgid "Updateoptions"
msgstr "Updateoptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:583
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6762,12 +7020,12 @@ msgstr ""
"comandos quando é executado para a fase de actualização."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:587
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:588
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6776,12 +7034,12 @@ msgstr ""
"continuar. A predefinição é avisar apenas em caso de erro."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:594
msgid "How APT calls dpkg"
msgstr "Como o APT chama o dpkg"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:595
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6790,7 +7048,7 @@ msgstr ""
"&dpkg;. Estas estão na secção <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:583
+#: apt.conf.5.xml:600
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -6801,17 +7059,17 @@ msgstr ""
"um argumento único ao &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:606
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6824,12 +7082,12 @@ msgstr ""
"bin/sh</filename>, caso algum deles falhe, o APT irá abortar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:612
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:613
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6845,7 +7103,7 @@ msgstr ""
"deb que vai instalar, um por cada linha."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:619
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6860,12 +7118,12 @@ msgstr ""
"dado ao <literal>Pre-Install-Pkgs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:626
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:627
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6874,12 +7132,12 @@ msgstr ""
"predefinição é <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:631
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:615
+#: apt.conf.5.xml:632
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6888,12 +7146,12 @@ msgstr ""
"predefinição é desactivar a assinatura e produzir todos os binários."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:637
msgid "dpkg trigger usage (and related options)"
msgstr "Utilização trigger do dpkg (e opções relacionadas)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:638
#, fuzzy
#| msgid ""
#| "APT can call dpkg in a way so it can make aggressive use of triggers over "
@@ -6932,7 +7190,7 @@ msgstr ""
"todos os pacotes."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:653
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6946,7 +7204,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:647
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -6970,12 +7228,12 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:642
+#: apt.conf.5.xml:659
msgid "DPkg::NoTriggers"
msgstr "DPkg::NoTriggers"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:660
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -6996,12 +7254,12 @@ msgstr ""
"chamadas unpack e remove."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:650
+#: apt.conf.5.xml:667
msgid "PackageManager::Configure"
msgstr "PackageManager::Configure"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:668
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7029,12 +7287,12 @@ msgstr ""
"poderia não arrancar!"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:678
msgid "DPkg::ConfigurePending"
msgstr "DPkg::ConfigurePending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:662
+#: apt.conf.5.xml:679
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -7052,12 +7310,12 @@ msgstr ""
"esta opção em todas excepto na última execução."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:685
msgid "DPkg::TriggersPending"
msgstr "DPkg::TriggersPending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:669
+#: apt.conf.5.xml:686
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7073,12 +7331,12 @@ msgstr ""
"configurar este pacote."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:691
msgid "PackageManager::UnpackAll"
msgstr "PackageManager::UnpackAll"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:675
+#: apt.conf.5.xml:692
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-"
@@ -7097,12 +7355,12 @@ msgstr ""
"experimental e necessita de mais melhorias antes de se tornar realmente útil."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:699
msgid "OrderList::Score::Immediate"
msgstr "OrderList::Score::Immediate"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:707
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7120,7 +7378,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:700
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 "
@@ -7144,12 +7402,12 @@ msgstr ""
"predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:720
msgid "Periodic and Archives options"
msgstr "Opções Periodic e Archives"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:721
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7162,12 +7420,12 @@ msgstr ""
"Veja o cabeçalho deste script para uma breve documentação das suas opções."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:729
msgid "Debug options"
msgstr "Opções de depuração"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:731
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7184,7 +7442,7 @@ msgstr ""
"interesse para o utilizador normal, mas algumas podem ter:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:742
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7195,7 +7453,7 @@ msgstr ""
"remove, purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:750
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7206,7 +7464,7 @@ msgstr ""
"<literal>apt-get -s install</literal>) como um utilizador não root."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:759
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7218,7 +7476,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:750
+#: apt.conf.5.xml:767
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -7227,17 +7485,17 @@ msgstr ""
"IDs de CDROM."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:777
msgid "A full list of debugging options to apt follows."
msgstr "Segue-se uma lista completa de opções de depuração para o apt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:782
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:769
+#: apt.conf.5.xml:786
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -7245,45 +7503,45 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:793
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:780
+#: apt.conf.5.xml:797
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Escreve informação relacionada com o descarregamento de pacotes usando FTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:787
+#: apt.conf.5.xml:804
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:791
+#: apt.conf.5.xml:808
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Escreve informação relacionada com o descarregamento de pacotes usando HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:815
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:802
+#: apt.conf.5.xml:819
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
"Escreve informação relacionada com o descarregamento de pacotes usando HTTPS."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:826
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:813
+#: apt.conf.5.xml:830
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7292,12 +7550,12 @@ msgstr ""
"criptográficas usando <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:820
+#: apt.conf.5.xml:837
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:841
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -7306,23 +7564,23 @@ msgstr ""
"armazenados em CD-ROMs."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:848
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:851
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Descreve os processos de resolver dependências de compilação no &apt-get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:858
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:861
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7331,12 +7589,12 @@ msgstr ""
"<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:868
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:871
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 "
@@ -7347,12 +7605,12 @@ msgstr ""
"para um CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:879
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:882
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."
@@ -7362,24 +7620,24 @@ msgstr ""
"literal></quote> ao mesmo tempo."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:873
+#: apt.conf.5.xml:890
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:894
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Regista no log quando os items são adicionados ou removidos da fila de "
"download global."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:884
+#: apt.conf.5.xml:901
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:887
+#: apt.conf.5.xml:904
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7388,12 +7646,12 @@ msgstr ""
"checksums e assinaturas criptográficas dos ficheiros descarregados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:894
+#: apt.conf.5.xml:911
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:897
+#: apt.conf.5.xml:914
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7403,12 +7661,12 @@ msgstr ""
"pacote."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:905
+#: apt.conf.5.xml:922
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:909
+#: apt.conf.5.xml:926
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7417,12 +7675,12 @@ msgstr ""
"do apt quando se descarrega diffs de índice em vez de índices completos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:916
+#: apt.conf.5.xml:933
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:920
+#: apt.conf.5.xml:937
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -7430,12 +7688,12 @@ msgstr ""
"downloads."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:927
+#: apt.conf.5.xml:944
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:948
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7444,12 +7702,12 @@ msgstr ""
"de pacotes e com a remoção de pacotes não utilizados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:955
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:941
+#: apt.conf.5.xml:958
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7464,12 +7722,12 @@ msgstr ""
"literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:969
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:955
+#: apt.conf.5.xml:972
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7499,22 +7757,22 @@ msgstr ""
"pacote aparece."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:991
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:994
msgid "Dump the default configuration to standard error on startup."
msgstr "Despeja a configuração predefinida para o erro standard no arranque."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:984
+#: apt.conf.5.xml:1001
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:987
+#: apt.conf.5.xml:1004
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7524,12 +7782,12 @@ msgstr ""
"único."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1012
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:998
+#: apt.conf.5.xml:1015
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7538,12 +7796,12 @@ msgstr ""
"estado e quaisquer erros encontrados enquanto os analisa."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1022
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1009
+#: apt.conf.5.xml:1026
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7552,12 +7810,12 @@ msgstr ""
"literal> deve passar os pacotes ao &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1034
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1021
+#: apt.conf.5.xml:1038
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -7565,22 +7823,22 @@ msgstr ""
"&dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1028
+#: apt.conf.5.xml:1045
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1032
+#: apt.conf.5.xml:1049
msgid "Output the priority of each package list on startup."
msgstr "Escreve a prioridade da cada lista de pacote no arranque."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1055
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1042
+#: apt.conf.5.xml:1059
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7589,12 +7847,12 @@ msgstr ""
"acontece quando é encontrado um problema de dependências complexo)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1050
+#: apt.conf.5.xml:1067
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:1053
+#: apt.conf.5.xml:1070
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 "
@@ -7605,12 +7863,12 @@ msgstr ""
"mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1078
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1065
+#: apt.conf.5.xml:1082
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7619,7 +7877,7 @@ msgstr ""
"vendors.list</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1088
+#: apt.conf.5.xml:1105
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7628,13 +7886,13 @@ msgstr ""
"para todas as opções possíveis."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1112
msgid "&file-aptconf;"
msgstr "&file-aptconf;"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1100
+#: apt.conf.5.xml:1117
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7743,8 +8001,8 @@ msgstr ""
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
-"following naming convention: The files have no or \"<literal>pref</literal>"
-"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
"that it has ignored a file if the file doesn't match a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@ -8200,17 +8458,84 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release a=unstable\n"
+#| "Pin-Priority: 50\n"
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+#, fuzzy
+#| msgid "Packages"
+msgid "Package"
+msgstr "Packages"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
msgid "How APT Interprets Priorities"
msgstr "Como o APT Interpreta as Prioridades"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:314
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:315
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8219,12 +8544,12 @@ msgstr ""
"na versão do pacote (downgrade)"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:319
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8233,12 +8558,12 @@ msgstr ""
"destino, a menos que a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:325
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:326
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8248,12 +8573,12 @@ msgstr ""
"mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:288
+#: apt_preferences.5.xml:331
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:332
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8263,12 +8588,12 @@ msgstr ""
"recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:337
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:338
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8277,17 +8602,17 @@ msgstr ""
"instalada do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:342
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:343
msgid "prevents the version from being installed"
msgstr "previne a instalação da versão"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:309
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8298,7 +8623,7 @@ msgstr ""
"(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:348
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8312,7 +8637,7 @@ msgstr ""
"determina a prioridade da versão de pacote."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:354
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8321,7 +8646,7 @@ msgstr ""
"registos apresentados atrás:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:358
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8349,12 +8674,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:371
msgid "Then:"
msgstr "Então:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:373
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8369,7 +8694,7 @@ msgstr ""
"downgrade ao <literal>perl</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:378
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8380,7 +8705,7 @@ msgstr ""
"versões, mesmo versões que pertencem ao lançamento de destino."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:382
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8393,12 +8718,12 @@ msgstr ""
"instalação e se nenhuma versão do pacote já estiver instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:392
msgid "Determination of Package Version and Distribution Properties"
msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:394
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8409,27 +8734,27 @@ msgstr ""
"descrever os pacotes disponíveis nessa localização."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:406
msgid "the <literal>Package:</literal> line"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:364
+#: apt_preferences.5.xml:407
msgid "gives the package name"
msgstr "fornece o nome do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
msgid "the <literal>Version:</literal> line"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:411
msgid "gives the version number for the named package"
msgstr "fornece o número de versão do pacote nomeado"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:398
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8450,12 +8775,12 @@ msgstr ""
"definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:427
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:428
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8472,18 +8797,18 @@ msgstr ""
"requerer a linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:438
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:444
msgid "the <literal>Codename:</literal> line"
msgstr "a linha <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:445
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -8500,13 +8825,13 @@ msgstr ""
"preferências do APT requer a linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:454
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:461
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8522,7 +8847,7 @@ msgstr ""
"seguintes linhas:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:470
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8534,12 +8859,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:479
msgid "the <literal>Component:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:480
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8557,18 +8882,18 @@ msgstr ""
"a linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:446
+#: apt_preferences.5.xml:489
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:452
+#: apt_preferences.5.xml:495
msgid "the <literal>Origin:</literal> line"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:453
+#: apt_preferences.5.xml:496
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8581,18 +8906,18 @@ msgstr ""
"linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:459
+#: apt_preferences.5.xml:502
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:465
+#: apt_preferences.5.xml:508
msgid "the <literal>Label:</literal> line"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:509
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8605,13 +8930,13 @@ msgstr ""
"linha:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:515
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:416
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8634,7 +8959,7 @@ msgstr ""
"APT: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:522
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8659,12 +8984,12 @@ msgstr ""
"literal> da distribuição <literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:535
msgid "Optional Lines in an APT Preferences Record"
msgstr "Linhas Opcionais num Registo de Preferências do APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:494
+#: apt_preferences.5.xml:537
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8675,12 +9000,12 @@ msgstr ""
"literal>. Isto disponibiliza um espaço para comentários."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:503
+#: apt_preferences.5.xml:546
msgid "Tracking Stable"
msgstr "Acompanhando Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:554
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8704,7 +9029,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:548
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8720,8 +9045,8 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8733,7 +9058,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:566
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8746,13 +9071,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:583
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:577
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8765,12 +9090,12 @@ msgstr ""
"outra vez. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:589
msgid "Tracking Testing or Unstable"
msgstr "Acompanhando Testing ou Unstable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:555
+#: apt_preferences.5.xml:598
#, no-wrap
msgid ""
"Package: *\n"
@@ -8798,7 +9123,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:591
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8815,7 +9140,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:612
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8828,13 +9153,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:632
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:623
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -8853,12 +9178,12 @@ msgstr ""
"versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:596
+#: apt_preferences.5.xml:639
msgid "Tracking the evolution of a codename release"
msgstr "Acompanhando a evolução de um nome de código de lançamento"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:610
+#: apt_preferences.5.xml:653
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8892,7 +9217,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:641
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8918,7 +9243,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:670
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -8931,13 +9256,13 @@ msgstr ""
"codename;</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:647
+#: apt_preferences.5.xml:690
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:681
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -8956,12 +9281,12 @@ msgstr ""
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:699
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:662
+#: apt_preferences.5.xml:705
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -9093,8 +9418,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:81
-#, no-wrap
-msgid "deb uri distribution [component1] [component2] [...]"
+#, fuzzy, no-wrap
+#| msgid "deb uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri distribution [component1] [component2] [...]"
msgstr "deb uri distribuição [componente1] [componente2] [...]"
#. type: Content of: <refentry><refsect1><para>
@@ -9165,6 +9491,38 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:112
msgid ""
+"<literal>options</literal> is always optional and needs to be surounded by "
+"square brackets. It can consist of multiple settings in the form "
+"<literal><replaceable>setting</replaceable>=<replaceable>value</"
+"replaceable></literal>. Multiple settings are separated by spaces. The "
+"following settings are supported by APT, note through that unsupported "
+"settings will be ignored silently:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:117
+msgid ""
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> can be used to specify for which architectures "
+"packages information should be downloaded. If this option is not set all "
+"architectures defined by the <literal>APT::Architectures</literal> option "
+"will be downloaded."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:128
+msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@ -9177,12 +9535,12 @@ msgstr ""
"Internet, por exemplo)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:133
msgid "Some examples:"
msgstr "Alguns exemplos:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:119
+#: sources.list.5.xml:135
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -9194,17 +9552,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:125
+#: sources.list.5.xml:141
msgid "URI specification"
msgstr "Especificação da URI"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:146
msgid "file"
msgstr "file"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:132
+#: sources.list.5.xml:148
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -9215,7 +9573,7 @@ msgstr ""
"arquivos locais."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:155
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -9225,7 +9583,7 @@ msgstr ""
"fontes."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:162
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9242,7 +9600,7 @@ msgstr ""
"método de autenticação seguro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:173
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -9261,12 +9619,12 @@ msgstr ""
"especificados no ficheiro de configuração serão ignorados."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:182
msgid "copy"
msgstr "copy"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:184
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -9278,17 +9636,17 @@ msgstr ""
"com o APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "rsh"
msgstr "rsh"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "ssh"
msgstr "ssh"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:191
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -9303,12 +9661,12 @@ msgstr ""
"para executar as transferências de ficheiros remotos."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:199
msgid "more recognizable URI types"
msgstr "tipos de URI mais reconhecíveis"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:185
+#: sources.list.5.xml:201
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
@@ -9330,7 +9688,7 @@ msgstr ""
"<manvolnum>1</manvolnum></citerefentry>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:143
msgid ""
"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -9339,7 +9697,7 @@ msgstr ""
"ssh, rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:215
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -9348,36 +9706,59 @@ msgstr ""
"para stable/main, stable/contrib, e stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:203
+#: sources.list.5.xml:219
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:220
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:222
msgid "Source line for the above"
msgstr "Linha de fonte para o referido acima"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:223
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:209
+#: sources.list.5.xml:225
+msgid ""
+"The first line gets package information for the architectures in "
+"<literal>APT::Architectures</literal> while the second always retrieves "
+"<literal>amd64</literal> and <literal>armel</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:227
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+#| " "
+msgid ""
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgstr ""
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+" "
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:230
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -9386,13 +9767,13 @@ msgstr ""
"hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:211
+#: sources.list.5.xml:232
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:234
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -9401,13 +9782,13 @@ msgstr ""
"usa apenas a área &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:236
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:238
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -9420,20 +9801,20 @@ msgstr ""
"uma única sessão FTP para ambas linhas de recurso."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:251
#, fuzzy, no-wrap
#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:244
#, fuzzy
#| msgid ""
#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@ -9461,7 +9842,7 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:256
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
@@ -10978,6 +11359,34 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
+#~ msgid ""
+#~ "Update the local keyring with the keyring of Debian archive keys and "
+#~ "removes from the keyring the archive keys which are no longer valid."
+#~ msgstr ""
+#~ "Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e "
+#~ "remove do chaveiro as chaves de arquivo que já não são válidas."
+
+#~ msgid "unmarkauto"
+#~ msgstr "unmarkauto"
+
+#~ msgid "<option>-h</option>"
+#~ msgstr "<option>-h</option>"
+
+#~ msgid "<option>--help</option>"
+#~ msgstr "<option>--help</option>"
+
+#~ msgid "Show a short usage summary."
+#~ msgstr "Mostra um curto sumário de utilização."
+
+#~ msgid "<option>-v</option>"
+#~ msgstr "<option>-v</option>"
+
+#~ msgid "<option>--version</option>"
+#~ msgstr "<option>--version</option>"
+
+#~ msgid "Show the program version."
+#~ msgstr "Mostra a versão do programa."
+
#~ msgid "<option>--md5</option>"
#~ msgstr "<option>--md5</option>"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 5a8db4dd5..ba7ef6ac7 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2011-04-05 10:22+0300\n"
+"POT-Creation-Date: 2011-11-10 16:42+0100\n"
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -577,8 +577,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
-#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
+#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
+#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
#: sources.list.5.xml:36
#, fuzzy
@@ -595,7 +595,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:120
+#: apt-cache.8.xml:70 apt-get.8.xml:127
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -963,8 +963,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
+#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
+#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
msgid "options"
msgstr ""
@@ -987,7 +987,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
#: apt-sortpkgs.1.xml:61
msgid "<option>-s</option>"
msgstr ""
@@ -1008,12 +1008,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>-q</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
msgid "<option>--quiet</option>"
msgstr ""
@@ -1088,14 +1088,14 @@ msgstr ""
#: apt-cache.8.xml:317
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be twicked with these flags which will omit "
+"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: <literal>APT::Cache::"
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
"Cache::ShowRecommends</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350
+#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
msgid "<option>-f</option>"
msgstr ""
@@ -1112,7 +1112,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+#: apt-get.8.xml:452
msgid "<option>-a</option>"
msgstr ""
@@ -1208,14 +1209,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
-#: apt-sortpkgs.1.xml:67
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:596
+#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
-#: apt.conf.5.xml:1093 apt_preferences.5.xml:654
+#: apt-cache.8.xml:372 apt-get.8.xml:601 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt.conf.5.xml:1110 apt_preferences.5.xml:697
msgid "Files"
msgstr ""
@@ -1226,10 +1227,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
-#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:661
-#: sources.list.5.xml:234
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:611
+#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
#, fuzzy
msgid "See Also"
msgstr "Consulte também"
@@ -1241,8 +1242,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
-#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:617
+#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
msgid "Diagnostics"
msgstr ""
@@ -1341,12 +1342,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:142
+#: apt-cdrom.8.xml:94 apt-key.8.xml:161
msgid "Options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
msgid "<option>-d</option>"
msgstr ""
@@ -1382,7 +1383,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:364
+#: apt-cdrom.8.xml:116 apt-get.8.xml:375
msgid "<option>-m</option>"
msgstr ""
@@ -1427,17 +1428,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:395
+#: apt-cdrom.8.xml:143 apt-get.8.xml:406
msgid "<option>--just-print</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:397
+#: apt-cdrom.8.xml:144 apt-get.8.xml:408
msgid "<option>--recon</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:398
+#: apt-cdrom.8.xml:145 apt-get.8.xml:409
msgid "<option>--no-act</option>"
msgstr ""
@@ -1551,7 +1552,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
#: apt-sortpkgs.1.xml:73
#, fuzzy
msgid "&apt-conf;"
@@ -1616,7 +1617,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504
+#: apt-extracttemplates.1.xml:63 apt-get.8.xml:530
msgid "<option>-t</option>"
msgstr ""
@@ -1817,7 +1818,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:287
+#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
msgid "clean"
msgstr ""
@@ -2279,8 +2280,8 @@ msgid ""
"free</literal>"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
msgid "Architectures"
msgstr ""
@@ -2481,26 +2482,26 @@ msgid ""
"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
"replaceable>::<replaceable>Checksum</replaceable></literal> where "
-"<literal>Index</literal> can be <literal>Packages</literal>, "
-"<literal>Sources</literal> or <literal>Release</literal> and "
-"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
-"literal> or <literal>SHA256</literal>."
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:539
+#: apt-ftparchive.1.xml:540
msgid "<option>--db</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:542
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:547
+#: apt-ftparchive.1.xml:548
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2509,12 +2510,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
msgid "<option>--delink</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:556
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -2523,12 +2524,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:562
msgid "<option>--contents</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:564
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -2538,12 +2539,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:571
+#: apt-ftparchive.1.xml:572
msgid "<option>--source-override</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:573
+#: apt-ftparchive.1.xml:574
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2551,24 +2552,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:578
msgid "<option>--readonly</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:580
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:584
msgid "<option>--arch</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:585
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2577,12 +2578,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:590
+#: apt-ftparchive.1.xml:591
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:592
+#: apt-ftparchive.1.xml:593
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -2596,12 +2597,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:602
+#: apt-ftparchive.1.xml:603
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:605
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2611,27 +2612,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:501
-#: sources.list.5.xml:198
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
#, fuzzy
msgid "Examples"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:622
+#: apt-ftparchive.1.xml:623
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:618
+#: apt-ftparchive.1.xml:619
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:632
+#: apt-ftparchive.1.xml:633
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -2662,10 +2663,11 @@ msgid ""
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <group choice=\"req\"> <arg "
-"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
-"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
-"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
+"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
+"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
+"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
+"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
+"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
@@ -2687,7 +2689,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:115
+#: apt-get.8.xml:122
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
@@ -2696,12 +2698,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:124 apt-key.8.xml:127
+#: apt-get.8.xml:131 apt-key.8.xml:127
msgid "update"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:132
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources. The indexes of available packages are fetched from the "
@@ -2715,12 +2717,12 @@ msgid ""
msgstr ""
#. type: <tag></tag>
-#: apt-get.8.xml:136 guide.sgml:121
+#: apt-get.8.xml:143 guide.sgml:121
msgid "upgrade"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:137
+#: apt-get.8.xml:144
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -2735,12 +2737,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:149
+#: apt-get.8.xml:156
msgid "dselect-upgrade"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:150
+#: apt-get.8.xml:157
msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -2751,12 +2753,12 @@ msgid ""
msgstr ""
#. type: <tag></tag>
-#: apt-get.8.xml:159 guide.sgml:140
+#: apt-get.8.xml:166 guide.sgml:140
msgid "dist-upgrade"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:167
msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -2770,12 +2772,12 @@ msgid ""
msgstr ""
#. type: <tag></tag>
-#: apt-get.8.xml:172 guide.sgml:131
+#: apt-get.8.xml:179 guide.sgml:131
msgid "install"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:181
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
@@ -2791,7 +2793,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:199
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -2802,14 +2804,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:206
msgid ""
"Both of the version selection mechanisms can downgrade packages and must be "
"used with care."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:202
+#: apt-get.8.xml:209
msgid ""
"This is also the target to use if you want to upgrade one or more already-"
"installed packages without upgrading every package you have on your system. "
@@ -2821,14 +2823,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:220
msgid ""
"Finally, the &apt-preferences; mechanism allows you to create an alternative "
"installation policy for individual packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:224
msgid ""
"If no package matches the given expression and the expression contains one "
"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -2840,12 +2842,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:233
msgid "remove"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:227
+#: apt-get.8.xml:234
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note the removing a package "
@@ -2855,12 +2857,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:241
msgid "purge"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:235
+#: apt-get.8.xml:242
msgid ""
"<literal>purge</literal> is identical to <literal>remove</literal> except "
"that packages are removed and purged (any configuration files are deleted "
@@ -2868,12 +2870,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:246
msgid "source"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:240
+#: apt-get.8.xml:247
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -2885,7 +2887,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:248
+#: apt-get.8.xml:255
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
"src</literal> type lines in the &sources-list; file. This means that you "
@@ -2895,16 +2897,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:262
msgid ""
"If the <option>--compile</option> option is specified then the package will "
-"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
-"<option>--download-only</option> is specified then the source package will "
-"not be unpacked."
+"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+"the architecture as defined by the <command>--host-architecture</command> "
+"option. If <option>--download-only</option> is specified then the source "
+"package will not be unpacked."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:260
+#: apt-get.8.xml:269
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -2914,7 +2917,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:275
msgid ""
"Note that source packages are not tracked like binary packages, they exist "
"only in the current directory and are similar to downloading source tar "
@@ -2922,43 +2925,46 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:280
msgid "build-dep"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:281
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
-"attempt to satisfy the build dependencies for a source package."
+"attempt to satisfy the build dependencies for a source package. By default "
+"the dependencies are satisfied to build the package nativly. If desired a "
+"host-architecture can be specified with the <option>--host-architecture</"
+"option> option instead."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:276
+#: apt-get.8.xml:287
msgid "check"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:288
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:292
msgid "download"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:293
msgid ""
"<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:299
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -2970,12 +2976,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid "autoclean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:298
+#: apt-get.8.xml:309
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -2987,25 +2993,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:307
+#: apt-get.8.xml:318
msgid "autoremove"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:319
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for some package and that "
-"are no more needed."
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:323
msgid "changelog"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:324
msgid ""
"<literal>changelog</literal> downloads a package changelog and displays it "
"through <command>sensible-pager</command>. The server name and base "
@@ -3018,48 +3024,48 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:335
+#: apt-get.8.xml:346
msgid "<option>--no-install-recommends</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:336
+#: apt-get.8.xml:347
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:340
+#: apt-get.8.xml:351
msgid "<option>--install-suggests</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:341
+#: apt-get.8.xml:352
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:356
msgid "<option>--download-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:357
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:350
+#: apt-get.8.xml:361
msgid "<option>--fix-broken</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:362
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -3075,17 +3081,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:375
msgid "<option>--ignore-missing</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:365
+#: apt-get.8.xml:376
msgid "<option>--fix-missing</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:366
+#: apt-get.8.xml:377
msgid ""
"Ignore missing packages; If packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -3097,12 +3103,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:387
msgid "<option>--no-download</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:388
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -3110,7 +3116,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:384
+#: apt-get.8.xml:395
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3122,17 +3128,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:405
msgid "<option>--simulate</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:407
msgid "<option>--dry-run</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:410
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -3140,7 +3146,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:414
msgid ""
"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
"literal>) automatic. Also a notice will be displayed indicating that this "
@@ -3151,7 +3157,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:420
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -3160,22 +3166,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>-y</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:427
msgid "<option>--yes</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:417
+#: apt-get.8.xml:428
msgid "<option>--assume-yes</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:418
+#: apt-get.8.xml:429
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -3185,68 +3191,96 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:436
+msgid "<option>--assume-no</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:437
+msgid ""
+"Automatic \"no\" to all prompts. Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:441
msgid "<option>-u</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:441
msgid "<option>--show-upgraded</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:442
msgid ""
"Show upgraded packages; Print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>-V</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:431
+#: apt-get.8.xml:447
msgid "<option>--verbose-versions</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:448
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:453
+msgid "<option>--host-architecture</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:454
+msgid ""
+"This option controls the architecture packages are built for by <command>apt-"
+"get source --compile</command> and how cross-builddependencies are "
+"satisfied. By default is not set which means that the host architecture is "
+"the same as the build architecture (which is defined by <literal>APT::"
+"Architecture</literal>) Configuration Item: <literal>APT::Get::Host-"
+"Architecture</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:462
msgid "<option>-b</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:462
msgid "<option>--compile</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:463
msgid "<option>--build</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:464
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:468
msgid "<option>--ignore-hold</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:469
msgid ""
"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -3255,12 +3289,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:475
msgid "<option>--no-upgrade</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:450
+#: apt-get.8.xml:476
msgid ""
"Do not upgrade packages; When used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -3269,12 +3303,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:482
msgid "<option>--only-upgrade</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:483
msgid ""
"Do not install new packages; When used in conjunction with <literal>install</"
"literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -3283,12 +3317,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:489
msgid "<option>--force-yes</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:490
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -3298,12 +3332,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:497
msgid "<option>--print-uris</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:498
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -3316,12 +3350,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:508
msgid "<option>--purge</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:509
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -3330,24 +3364,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:516
msgid "<option>--reinstall</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:517
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:495
+#: apt-get.8.xml:521
msgid "<option>--list-cleanup</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:522
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -3358,17 +3392,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:505
+#: apt-get.8.xml:531
msgid "<option>--target-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:532
msgid "<option>--default-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:533
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -3382,12 +3416,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:546
msgid "<option>--trivial-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:522
+#: apt-get.8.xml:548
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -3396,24 +3430,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:554
msgid "<option>--no-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:555
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:534
+#: apt-get.8.xml:560
msgid "<option>--auto-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:561
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -3422,12 +3456,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:567
msgid "<option>--only-source</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:568
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -3439,22 +3473,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--diff-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--dsc-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:552
+#: apt-get.8.xml:578
msgid "<option>--tar-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:553
+#: apt-get.8.xml:579
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3462,24 +3496,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:558
+#: apt-get.8.xml:584
msgid "<option>--arch-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:585
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:589
msgid "<option>--allow-unauthenticated</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:564
+#: apt-get.8.xml:590
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
@@ -3487,14 +3521,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:603
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:612
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3502,29 +3536,29 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:618
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:595
+#: apt-get.8.xml:621
msgid "ORIGINAL AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:596
+#: apt-get.8.xml:622
msgid "&apt-author.jgunthorpe;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:599
+#: apt-get.8.xml:625
msgid "CURRENT AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:601
+#: apt-get.8.xml:627
msgid "&apt-author.team;"
msgstr ""
@@ -3638,19 +3672,38 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:131
msgid ""
-"Update the local keyring with the keyring of Debian archive keys and removes "
-"from the keyring the archive keys which are no longer valid."
+"Update the local keyring with the archive keyring and remove from the local "
+"keyring the archive keys which are no longer valid. The archive keyring is "
+"shipped in the <literal>archive-keyring</literal> package of your "
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:141
+msgid "net-update"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:145
+msgid ""
+"Work similar to the <command>update</command> command above, but get the "
+"archive keyring from an URI instead and validate it against a master key. "
+"This requires an installed &wget; and an APT build configured to have a "
+"server to fetch from and a master keyring to validate. APT in Debian does "
+"not support this command and relies on <command>update</command> instead, "
+"but Ubuntu's APT does."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:162
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:164
#, fuzzy
msgid "--keyring <replaceable>filename</replaceable>"
msgstr ""
@@ -3658,7 +3711,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:165
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
@@ -3669,44 +3722,46 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:178
msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:161
+#: apt-key.8.xml:180
#, fuzzy
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt.conf</>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:181
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:165
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
-msgstr ""
+#: apt-key.8.xml:184
+#, fuzzy
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
+msgstr "<filename>/etc/apt.conf</>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
-msgid "Keyring of Debian archive trusted keys."
+#: apt-key.8.xml:185
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:169
+#: apt-key.8.xml:188
+#, fuzzy
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
-msgstr ""
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
+msgstr "<filename>/etc/apt.conf</>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:170
-msgid "Keyring of Debian archive removed trusted keys."
+#: apt-key.8.xml:189
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:179
+#: apt-key.8.xml:198
#, fuzzy
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -3715,8 +3770,8 @@ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:16
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -3735,20 +3790,21 @@ msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
+"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
+"arg> </group>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:57
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:60
+#: apt-mark.8.xml:61
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -3758,108 +3814,132 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:68
-msgid "markauto"
+#: apt-mark.8.xml:69
+msgid "auto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:70
msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:78
msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:84
-msgid "showauto"
+#: apt-mark.8.xml:85
+msgid "hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:86
msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed. The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:95
+msgid "unhold"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:96
msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:97
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
+#: apt-mark.8.xml:101
+msgid "showauto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:100
+#: apt-mark.8.xml:102
msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line. All automatically "
+"installed packages will be listed if no package is given. If packages are "
+"given only those which are automatically installed will be shown."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:106
-msgid "<option>-h</option>"
+#: apt-mark.8.xml:109
+msgid "showmanual"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:107
-msgid "<option>--help</option>"
+#: apt-mark.8.xml:116
+msgid "showhold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:108
-msgid "Show a short usage summary."
+#: apt-mark.8.xml:117
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:114
-msgid "<option>-v</option>"
+#: apt-mark.8.xml:130
+msgid ""
+"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:115
-msgid "<option>--version</option>"
+#: apt-mark.8.xml:131
+msgid ""
+"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
+"option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid "Show the program version."
+#: apt-mark.8.xml:134
+msgid ""
+"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
+"filename> instead of the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:127
+#: apt-mark.8.xml:146
msgid " &file-extended_states;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:132
+#: apt-mark.8.xml:151
#, fuzzy
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:136
+#: apt-mark.8.xml:155
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -4196,11 +4276,12 @@ msgstr ""
#: apt.conf.5.xml:52
msgid ""
"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
-"order which have no or \"<literal>conf</literal>\" as filename extension and "
-"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
-"characters. Otherwise APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters. Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
msgstr ""
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
@@ -4372,13 +4453,24 @@ msgid ""
"compiled for."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:158
+msgid ""
+"All Architectures the system supports. Processors implementing the "
+"<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
+"<literal>i386</literal>; This list is use when fetching files and parsing "
+"package lists. The internal default is always the native architecture "
+"(<literal>APT::Architecture</literal>) and all foreign architectures it can "
+"retrieve by calling <command>dpkg --print-foreign-architectures</command>."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:165
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:166
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -4387,24 +4479,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:171
msgid "Ignore-Hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:164
+#: apt.conf.5.xml:172
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:176
msgid "Clean-Installed"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:177
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -4413,12 +4505,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:175
+#: apt.conf.5.xml:183
msgid "Immediate-Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:176
+#: apt.conf.5.xml:184
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -4451,12 +4543,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:198
+#: apt.conf.5.xml:206
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:207
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -4467,12 +4559,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:215
msgid "Cache-Start, Cache-Grow and Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:208
+#: apt.conf.5.xml:216
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
@@ -4492,63 +4584,63 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:223
+#: apt.conf.5.xml:231
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:232
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:235
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:236
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:240
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:241
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:245
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:238
+#: apt.conf.5.xml:246
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:244
+#: apt.conf.5.xml:252
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:249
+#: apt.conf.5.xml:257
msgid "Check-Valid-Until"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:250
+#: apt.conf.5.xml:258
msgid ""
"Security related option defaulting to true as an expiring validation for a "
"Release file prevents longtime replay attacks and can e.g. also help users "
@@ -4560,54 +4652,67 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:260
+#: apt.conf.5.xml:268
msgid "Max-ValidTime"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:261
+#: apt.conf.5.xml:269
msgid ""
-"Seconds the Release file should be considered valid after it was created. "
-"The default is \"for ever\" (0) if the Release file of the archive doesn't "
-"include a <literal>Valid-Until</literal> header. If it does then this date "
-"is the default. The date from the Release file or the date specified by the "
-"creation time of the Release file (<literal>Date</literal> header) plus the "
-"seconds specified with this options are used to check if the validation of a "
-"file has expired by using the earlier date of the two. Archive specific "
-"settings can be made by appending the label of the archive to the option "
-"name."
+"Seconds the Release file should be considered valid after it was created "
+"(indicated by the <literal>Date</literal> header). If the Release file "
+"itself includes a <literal>Valid-Until</literal> header the earlier date of "
+"the two is used as the expiration date. The default value is <literal>0</"
+"literal> which stands for \"for ever\". Archive specific settings can be "
+"made by appending the label of the archive to the option name."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:279
+msgid "Min-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
+msgid ""
+"Minimum of seconds the Release file should be considered valid after it was "
+"created (indicated by the <literal>Date</literal> header). Use this if you "
+"need to use a seldomly updated (local) mirror of a more regular updated "
+"archive with a <literal>Valid-Until</literal> header instead of competely "
+"disabling the expiration date checking. Archive specific settings can and "
+"should be used by appending the label of the archive to the option name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:290
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:274
+#: apt.conf.5.xml:291
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:294
msgid ""
"Two sub-options to limit the use of PDiffs are also available: With "
"<literal>FileLimit</literal> can be specified how many PDiff files are "
"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
-"other hand is the maximum precentage of the size of all patches compared to "
+"other hand is the maximum percentage of the size of all patches compared to "
"the size of the targeted file. If one of these limits is exceeded the "
"complete file is downloaded instead of the patches."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:303
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:304
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4617,36 +4722,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:311
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:295
+#: apt.conf.5.xml:312
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:299
+#: apt.conf.5.xml:316
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:300
+#: apt.conf.5.xml:317
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304 sources.list.5.xml:144
+#: apt.conf.5.xml:321 sources.list.5.xml:160
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:322
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4657,7 +4762,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#: apt.conf.5.xml:330
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4671,7 +4776,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:323 apt.conf.5.xml:387
+#: apt.conf.5.xml:340 apt.conf.5.xml:404
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4679,7 +4784,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:343
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -4691,7 +4796,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:351
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -4701,7 +4806,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:339
+#: apt.conf.5.xml:356
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -4709,12 +4814,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:362
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:363
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4724,7 +4829,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:352
+#: apt.conf.5.xml:369
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4745,12 +4850,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:370 sources.list.5.xml:155
+#: apt.conf.5.xml:387 sources.list.5.xml:171
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:388
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4769,7 +4874,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:407
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -4779,7 +4884,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:414
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -4788,7 +4893,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:419
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4798,18 +4903,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:409 sources.list.5.xml:137
+#: apt.conf.5.xml:426 sources.list.5.xml:153
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:415
+#: apt.conf.5.xml:432
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:410
+#: apt.conf.5.xml:427
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4822,12 +4927,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:437
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:421
+#: apt.conf.5.xml:438
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4835,18 +4940,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:443
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:449
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:427
+#: apt.conf.5.xml:444
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4858,19 +4963,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:454
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:457
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:433
+#: apt.conf.5.xml:450
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -4887,20 +4992,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:461
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:442
+#: apt.conf.5.xml:459
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
"will only be used if this file exists, e.g. for the bzip2 method (the "
-"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
-"that list entries specified on the command line will be added at the end of "
-"the list specified in the configuration files, but before the default "
+"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+"also that list entries specified on the command line 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 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 "
@@ -4908,20 +5013,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:466
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
"uncompressed files so this is mostly only useable for local mirrors."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:454
+#: apt.conf.5.xml:471
msgid "GzipIndexes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:473
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4930,12 +5035,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:463
+#: apt.conf.5.xml:480
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:481
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
@@ -4948,13 +5053,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:480
+#: apt.conf.5.xml:497
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:487
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -4977,19 +5082,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:253
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:487
+#: apt.conf.5.xml:504
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:506
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -5001,7 +5106,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:496
+#: apt.conf.5.xml:513
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -5014,7 +5119,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:522
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -5024,7 +5129,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:528
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -5032,7 +5137,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:532
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -5043,7 +5148,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:540
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -5056,7 +5161,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:536
+#: apt.conf.5.xml:553
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -5067,12 +5172,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:562
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:564
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -5080,12 +5185,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:551
+#: apt.conf.5.xml:568
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:569
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5096,50 +5201,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:578
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:582
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:583
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:587
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:588
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:577
+#: apt.conf.5.xml:594
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:595
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:583
+#: apt.conf.5.xml:600
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -5147,17 +5252,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:605
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:589
+#: apt.conf.5.xml:606
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5166,12 +5271,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:612
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:613
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5181,7 +5286,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:602
+#: apt.conf.5.xml:619
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5191,36 +5296,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:626
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:627
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:631
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:615
+#: apt.conf.5.xml:632
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:637
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:638
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiple calls of dpkg. Without further options dpkg will use triggers only "
@@ -5235,7 +5340,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:653
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5245,7 +5350,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:647
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -5259,12 +5364,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:642
+#: apt.conf.5.xml:659
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:660
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -5276,12 +5381,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:650
+#: apt.conf.5.xml:667
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:668
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5297,12 +5402,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:678
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:662
+#: apt.conf.5.xml:679
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -5313,12 +5418,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:685
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:669
+#: apt.conf.5.xml:686
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5328,12 +5433,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:691
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:675
+#: apt.conf.5.xml:692
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-"
@@ -5345,12 +5450,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:699
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:707
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5362,7 +5467,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:700
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 "
@@ -5376,12 +5481,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:703
+#: apt.conf.5.xml:720
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:721
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5390,12 +5495,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:729
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:731
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5406,7 +5511,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:742
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5414,7 +5519,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:750
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5422,7 +5527,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:759
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5432,120 +5537,120 @@ 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:750
+#: apt.conf.5.xml:767
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:760
+#: apt.conf.5.xml:777
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:782
#, fuzzy
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:786
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:793
#, fuzzy
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:780
+#: apt.conf.5.xml:797
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:787
+#: apt.conf.5.xml:804
#, fuzzy
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:791
+#: apt.conf.5.xml:808
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:815
#, fuzzy
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:802
+#: apt.conf.5.xml:819
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:826
#, fuzzy
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:813
+#: apt.conf.5.xml:830
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:820
+#: apt.conf.5.xml:837
#, fuzzy
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:841
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:831
+#: apt.conf.5.xml:848
#, fuzzy
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:851
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:858
#, fuzzy
msgid "<literal>Debug::Hashes</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:861
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:851
+#: apt.conf.5.xml:868
#, fuzzy
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:871
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 "
@@ -5553,99 +5658,99 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:879
#, fuzzy
msgid "<literal>Debug::NoLocking</literal>"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:882
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:873
+#: apt.conf.5.xml:890
#, fuzzy
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:894
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:884
+#: apt.conf.5.xml:901
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:904
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:894
+#: apt.conf.5.xml:911
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:897
+#: apt.conf.5.xml:914
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:905
+#: apt.conf.5.xml:922
#, fuzzy
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:926
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:916
+#: apt.conf.5.xml:933
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:937
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:927
+#: apt.conf.5.xml:944
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:931
+#: apt.conf.5.xml:948
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:938
+#: apt.conf.5.xml:955
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:958
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5655,12 +5760,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:969
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:955
+#: apt.conf.5.xml:972
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5677,96 +5782,96 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:991
#, fuzzy
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:994
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:984
+#: apt.conf.5.xml:1001
#, fuzzy
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:987
+#: apt.conf.5.xml:1004
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:995
+#: apt.conf.5.xml:1012
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:998
+#: apt.conf.5.xml:1015
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:1005
+#: apt.conf.5.xml:1022
#, fuzzy
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1009
+#: apt.conf.5.xml:1026
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:1017
+#: apt.conf.5.xml:1034
#, fuzzy
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1021
+#: apt.conf.5.xml:1038
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1028
+#: apt.conf.5.xml:1045
#, fuzzy
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1032
+#: apt.conf.5.xml:1049
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1055
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1042
+#: apt.conf.5.xml:1059
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:1050
+#: apt.conf.5.xml:1067
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1053
+#: apt.conf.5.xml:1070
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 "
@@ -5774,33 +5879,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1078
#, fuzzy
msgid "<literal>Debug::sourceList</literal>"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1065
+#: apt.conf.5.xml:1082
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:1088
+#: apt.conf.5.xml:1105
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1112
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1100
+#: apt.conf.5.xml:1117
#, fuzzy
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -5895,8 +6000,8 @@ msgstr ""
msgid ""
"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
"directory are parsed in alphanumeric ascending order and need to obey the "
-"following naming convention: The files have no or \"<literal>pref</literal>"
-"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
"underscore (_) and period (.) characters. Otherwise APT will print a notice "
"that it has ignored a file if the file doesn't match a pattern in the "
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@ -6350,19 +6455,78 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, fuzzy, no-wrap
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"<programlisting>\n"
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, fuzzy, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"<programlisting>\n"
+"Package: *\n"
+"Pin: release a=unstable\n"
+"Pin-Priority: 50\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+msgid "Package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
#, fuzzy
msgid "How APT Interprets Priorities"
msgstr "Como o APT Interpreta Prioridades"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:271
+#: apt_preferences.5.xml:314
#, fuzzy
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:315
#, fuzzy
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
@@ -6372,13 +6536,13 @@ msgstr ""
"dowgrade do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:276
+#: apt_preferences.5.xml:319
#, fuzzy
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:277
+#: apt_preferences.5.xml:320
#, fuzzy
msgid ""
"causes a version to be installed even if it does not come from the target "
@@ -6388,13 +6552,13 @@ msgstr ""
"versão alvo, a menos que a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:282
+#: apt_preferences.5.xml:325
#, fuzzy
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:326
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -6404,13 +6568,13 @@ msgstr ""
"disponível pertencente a versão alvo ou a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:288
+#: apt_preferences.5.xml:331
#, fuzzy
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:289
+#: apt_preferences.5.xml:332
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -6421,13 +6585,13 @@ msgstr ""
"seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:337
#, fuzzy
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt;= P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:295
+#: apt_preferences.5.xml:338
#, fuzzy
msgid ""
"causes a version to be installed only if there is no installed version of "
@@ -6437,19 +6601,19 @@ msgstr ""
"instalada do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:342
#, fuzzy
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:300
+#: apt_preferences.5.xml:343
#, fuzzy
msgid "prevents the version from being installed"
msgstr "impede a versão de ser instalada"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:309
#, fuzzy
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
@@ -6461,7 +6625,7 @@ msgstr ""
"seguir (a grosso modo):"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:305
+#: apt_preferences.5.xml:348
#, fuzzy
msgid ""
"If any specific-form records match an available package version then the "
@@ -6477,7 +6641,7 @@ msgstr ""
"determinará a prioridade da versão do pacote."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:354
#, fuzzy
msgid ""
"For example, suppose the APT preferences file contains the three records "
@@ -6487,7 +6651,7 @@ msgstr ""
"registros apresentados anteriormente :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:358
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -6516,12 +6680,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:371
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:373
#, fuzzy
msgid ""
"The most recent available version of the <literal>perl</literal> package "
@@ -6537,7 +6701,7 @@ msgstr ""
"será feito um downgrade do <literal>perl</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:378
#, fuzzy
msgid ""
"A version of any package other than <literal>perl</literal> that is "
@@ -6549,7 +6713,7 @@ msgstr ""
"mesmo versões pertencentes a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:382
#, fuzzy
msgid ""
"A version of a package whose origin is not the local system but some other "
@@ -6564,13 +6728,13 @@ msgstr ""
"instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:349
+#: apt_preferences.5.xml:392
#, fuzzy
msgid "Determination of Package Version and Distribution Properties"
msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:394
#, fuzzy
msgid ""
"The locations listed in the &sources-list; file should provide "
@@ -6582,31 +6746,31 @@ msgstr ""
"os pacotes disponíveis nessas localidades."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:363
+#: apt_preferences.5.xml:406
#, fuzzy
msgid "the <literal>Package:</literal> line"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:364
+#: apt_preferences.5.xml:407
#, fuzzy
msgid "gives the package name"
msgstr "informa o nome do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:367 apt_preferences.5.xml:417
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
#, fuzzy
msgid "the <literal>Version:</literal> line"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:411
#, fuzzy
msgid "gives the version number for the named package"
msgstr "informa o número de versão do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:398
#, fuzzy
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
@@ -6628,13 +6792,13 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:427
#, fuzzy
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:428
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -6652,7 +6816,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:438
#, fuzzy, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
@@ -6660,13 +6824,13 @@ msgstr ""
"Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:444
#, fuzzy
msgid "the <literal>Codename:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:402
+#: apt_preferences.5.xml:445
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -6684,7 +6848,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:454
#, fuzzy, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr ""
@@ -6692,7 +6856,7 @@ msgstr ""
"Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:418
+#: apt_preferences.5.xml:461
#, fuzzy
msgid ""
"names the release version. For example, the packages in the tree might "
@@ -6709,7 +6873,7 @@ msgstr ""
"das linhas a seguir."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:470
#, fuzzy, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6722,13 +6886,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:479
#, fuzzy
msgid "the <literal>Component:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:437
+#: apt_preferences.5.xml:480
#, fuzzy
msgid ""
"names the licensing component associated with the packages in the directory "
@@ -6747,7 +6911,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:446
+#: apt_preferences.5.xml:489
#, fuzzy, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
@@ -6755,13 +6919,13 @@ msgstr ""
"Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:452
+#: apt_preferences.5.xml:495
#, fuzzy
msgid "the <literal>Origin:</literal> line"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:453
+#: apt_preferences.5.xml:496
#, fuzzy
msgid ""
"names the originator of the packages in the directory tree of the "
@@ -6775,7 +6939,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:459
+#: apt_preferences.5.xml:502
#, fuzzy, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
@@ -6783,13 +6947,13 @@ msgstr ""
"Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:465
+#: apt_preferences.5.xml:508
#, fuzzy
msgid "the <literal>Label:</literal> line"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:509
#, fuzzy
msgid ""
"names the label of the packages in the directory tree of the "
@@ -6802,7 +6966,7 @@ msgstr ""
"arquivo de preferências do APT iria requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:515
#, fuzzy, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
@@ -6810,7 +6974,7 @@ msgstr ""
"Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:416
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -6834,7 +6998,7 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:522
#, fuzzy
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -6860,13 +7024,13 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:535
#, fuzzy
msgid "Optional Lines in an APT Preferences Record"
msgstr "Linhas Opcionais em um Registro de Preferências do APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:494
+#: apt_preferences.5.xml:537
#, fuzzy
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
@@ -6878,13 +7042,13 @@ msgstr ""
"</literal>. Isto oferece um local para inserir comentários."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:503
+#: apt_preferences.5.xml:546
#, fuzzy
msgid "Tracking Stable"
msgstr "Acompanhando a Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:554
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6909,7 +7073,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:548
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -6925,8 +7089,8 @@ msgstr ""
"outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:528 apt_preferences.5.xml:574
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
+#: apt_preferences.5.xml:675
#, fuzzy, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6939,7 +7103,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:566
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -6952,7 +7116,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:583
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
@@ -6960,7 +7124,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:577
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -6973,13 +7137,13 @@ msgstr ""
"atualizado novamente a menos que esse comando seja executado novamente."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:589
#, fuzzy
msgid "Tracking Testing or Unstable"
msgstr "Acompanhando a Testing"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:555
+#: apt_preferences.5.xml:598
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7008,7 +7172,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:591
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -7025,7 +7189,7 @@ msgstr ""
"versões de pacotes de outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:612
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7038,7 +7202,7 @@ msgstr ""
"(s) última(s) versão(ões) <literal>testing</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:632
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
@@ -7046,7 +7210,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:623
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7066,12 +7230,12 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:596
+#: apt_preferences.5.xml:639
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:610
+#: apt_preferences.5.xml:653
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -7101,7 +7265,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:641
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -7116,7 +7280,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:627
+#: apt_preferences.5.xml:670
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7129,7 +7293,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:647
+#: apt_preferences.5.xml:690
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
@@ -7137,7 +7301,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:681
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7157,13 +7321,13 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:699
#, fuzzy
msgid "&file-preferences;"
msgstr "apt_preferences"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:662
+#: apt_preferences.5.xml:705
#, fuzzy
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -7248,7 +7412,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:81
#, no-wrap
-msgid "deb uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri distribution [component1] [component2] [...]"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -7293,6 +7457,38 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:112
msgid ""
+"<literal>options</literal> is always optional and needs to be surounded by "
+"square brackets. It can consist of multiple settings in the form "
+"<literal><replaceable>setting</replaceable>=<replaceable>value</"
+"replaceable></literal>. Multiple settings are separated by spaces. The "
+"following settings are supported by APT, note through that unsupported "
+"settings will be ignored silently:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:117
+msgid ""
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> can be used to specify for which architectures "
+"packages information should be downloaded. If this option is not set all "
+"architectures defined by the <literal>APT::Architectures</literal> option "
+"will be downloaded."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:128
+msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
@@ -7300,13 +7496,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:117
+#: sources.list.5.xml:133
#, fuzzy
msgid "Some examples:"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:119
+#: sources.list.5.xml:135
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -7315,17 +7511,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:125
+#: sources.list.5.xml:141
msgid "URI specification"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:146
msgid "file"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:132
+#: sources.list.5.xml:148
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7333,14 +7529,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:155
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:162
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7351,7 +7547,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:173
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7363,12 +7559,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:166
+#: sources.list.5.xml:182
msgid "copy"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:184
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -7376,17 +7572,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "rsh"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:189
msgid "ssh"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:191
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -7396,12 +7592,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:199
msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:185
+#: sources.list.5.xml:201
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
@@ -7414,75 +7610,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:143
msgid ""
"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:215
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:203
+#: sources.list.5.xml:219
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:220
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:222
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:207
+#: sources.list.5.xml:223
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:209
+#: sources.list.5.xml:225
+msgid ""
+"The first line gets package information for the architectures in "
+"<literal>APT::Architectures</literal> while the second always retrieves "
+"<literal>amd64</literal> and <literal>armel</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:227
+#, no-wrap
+msgid ""
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:230
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:211
+#: sources.list.5.xml:232
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:234
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:236
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:238
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7491,19 +7703,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:242
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:251
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:244
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7515,7 +7727,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:256
#, fuzzy
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -8594,10 +8806,6 @@ msgstr ""
#~ "Priority: release ...</literal>."
#, fuzzy
-#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
-#~ msgstr "<filename>/etc/apt.conf</>"
-
-#, fuzzy
#~ msgid "/usr/share/doc/apt/"
#~ msgstr "/usr/share/doc/apt/"
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index fabaaec1d..f289eb00d 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -10,24 +10,25 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include "apt-ftparchive.h"
-
+#include <config.h>
+
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/cmndline.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/init.h>
-#include <config.h>
-#include <apti18n.h>
#include <algorithm>
#include <climits>
#include <sys/time.h>
#include <regex.h>
+#include "apt-ftparchive.h"
#include "contents.h"
#include "multicompress.h"
-#include "writer.h"
+#include "writer.h"
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -205,7 +206,7 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats)
Packages.Output = 0; // Just in case
// Finish compressing
- unsigned long Size;
+ unsigned long long Size;
if (Comp.Finalize(Size) == false)
{
c0out << endl;
@@ -291,7 +292,7 @@ bool PackageMap::GenSources(Configuration &Setup,struct CacheDB::Stats &Stats)
Sources.Output = 0; // Just in case
// Finish compressing
- unsigned long Size;
+ unsigned long long Size;
if (Comp.Finalize(Size) == false)
{
c0out << endl;
@@ -362,11 +363,11 @@ bool PackageMap::GenContents(Configuration &Setup,
if (_error->PendingError() == true)
return false;
- unsigned long Size = Head.Size();
+ unsigned long long Size = Head.Size();
unsigned char Buf[4096];
while (Size != 0)
{
- unsigned long ToRead = Size;
+ unsigned long long ToRead = Size;
if (Size > sizeof(Buf))
ToRead = sizeof(Buf);
@@ -400,7 +401,7 @@ bool PackageMap::GenContents(Configuration &Setup,
Contents.Finish();
// Finish compressing
- unsigned long Size;
+ unsigned long long Size;
if (Comp.Finalize(Size) == false || _error->PendingError() == true)
{
c0out << endl;
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index 080c2bbcc..f0bfa2a6d 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -10,23 +10,26 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include "cachedb.h"
+#include <config.h>
-#include <apti18n.h>
#include <apt-pkg/error.h>
#include <apt-pkg/md5.h>
#include <apt-pkg/sha1.h>
#include <apt-pkg/sha2.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/configuration.h>
+#include <apt-pkg/fileutl.h>
#include <netinet/in.h> // htonl, etc
+
+#include <apti18n.h>
+#include "cachedb.h"
/*}}}*/
// CacheDB::ReadyDB - Ready the DB2 /*{{{*/
// ---------------------------------------------------------------------
/* This opens the DB2 file for caching package information */
-bool CacheDB::ReadyDB(string const &DB)
+bool CacheDB::ReadyDB(std::string const &DB)
{
int err;
@@ -46,7 +49,7 @@ bool CacheDB::ReadyDB(string const &DB)
DBLoaded = false;
Dbp = 0;
- DBFile = string();
+ DBFile = std::string();
if (DB.empty())
return true;
@@ -160,7 +163,7 @@ bool CacheDB::GetCurStat()
/*}}}*/
// CacheDB::GetFileInfo - Get all the info about the file /*{{{*/
// ---------------------------------------------------------------------
-bool CacheDB::GetFileInfo(string const &FileName, bool const &DoControl, bool const &DoContents,
+bool CacheDB::GetFileInfo(std::string const &FileName, bool const &DoControl, bool const &DoContents,
bool const &GenContentsOnly, bool const &DoMD5, bool const &DoSHA1,
bool const &DoSHA256, bool const &DoSHA512,
bool const &checkMtime)
@@ -296,12 +299,16 @@ bool CacheDB::LoadContents(bool const &GenOnly)
}
/*}}}*/
-static string bytes2hex(uint8_t *bytes, size_t length) {
- char space[129];
- if (length * 2 > sizeof(space) - 1) length = (sizeof(space) - 1) / 2;
- for (size_t i = 0; i < length; i++)
- snprintf(&space[i*2], 3, "%02x", bytes[i]);
- return string(space);
+static std::string bytes2hex(uint8_t *bytes, size_t length) {
+ char buf[3];
+ std::string space;
+
+ space.reserve(length*2 + 1);
+ for (size_t i = 0; i < length; i++) {
+ snprintf(buf, sizeof(buf), "%02x", bytes[i]);
+ space.append(buf);
+ }
+ return space;
}
static inline unsigned char xdig2num(char const &dig) {
@@ -494,7 +501,7 @@ bool CacheDB::Clean()
stringcmp(Colon + 1, (char *)Key.data+Key.size,"cl") == 0 ||
stringcmp(Colon + 1, (char *)Key.data+Key.size,"cn") == 0)
{
- if (FileExists(string((const char *)Key.data,Colon)) == true)
+ if (FileExists(std::string((const char *)Key.data,Colon)) == true)
continue;
}
}
diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index 15e796325..377c41607 100644
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -13,16 +13,16 @@
#define CACHEDB_H
+#include <apt-pkg/debfile.h>
#include <db.h>
-#include <string>
-#include <apt-pkg/debfile.h>
#include <inttypes.h>
#include <sys/stat.h>
#include <errno.h>
-
+#include <string>
+
#include "contents.h"
-
+
class CacheDB
{
protected:
@@ -34,7 +34,7 @@ class CacheDB
DB *Dbp;
bool DBLoaded;
bool ReadOnly;
- string DBFile;
+ std::string DBFile;
// Generate a key for the DB of a given type
inline void InitQuery(const char *Type)
@@ -81,7 +81,7 @@ class CacheDB
{
uint32_t Flags;
uint32_t mtime;
- uint32_t FileSize;
+ uint64_t FileSize;
uint8_t MD5[16];
uint8_t SHA1[20];
uint8_t SHA256[32];
@@ -90,7 +90,7 @@ class CacheDB
struct StatStore OldStat;
// 'set' state
- string FileName;
+ std::string FileName;
FileFd *Fd;
debDebFile *DebFile;
@@ -99,10 +99,10 @@ class CacheDB
// Data collection helpers
debDebFile::MemControlExtract Control;
ContentsExtract Contents;
- string MD5Res;
- string SHA1Res;
- string SHA256Res;
- string SHA512Res;
+ std::string MD5Res;
+ std::string SHA1Res;
+ std::string SHA256Res;
+ std::string SHA512Res;
// Runtime statistics
struct Stats
@@ -114,7 +114,7 @@ class CacheDB
double SHA512Bytes;
unsigned long Packages;
unsigned long Misses;
- unsigned long DeLinkBytes;
+ unsigned long long DeLinkBytes;
inline void Add(const Stats &S) {
Bytes += S.Bytes;
@@ -129,21 +129,21 @@ class CacheDB
Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {};
} Stats;
- bool ReadyDB(string const &DB);
+ bool ReadyDB(std::string const &DB);
inline bool DBFailed() {return Dbp != 0 && DBLoaded == false;};
inline bool Loaded() {return DBLoaded == true;};
- inline off_t GetFileSize(void) {return CurStat.FileSize;}
+ inline unsigned long long GetFileSize(void) {return CurStat.FileSize;}
- bool SetFile(string const &FileName,struct stat St,FileFd *Fd);
- bool GetFileInfo(string const &FileName, bool const &DoControl, bool const &DoContents, bool const &GenContentsOnly,
+ bool SetFile(std::string const &FileName,struct stat St,FileFd *Fd);
+ bool GetFileInfo(std::string const &FileName, bool const &DoControl, bool const &DoContents, bool const &GenContentsOnly,
bool const &DoMD5, bool const &DoSHA1, bool const &DoSHA256, bool const &DoSHA512, bool const &checkMtime = false);
bool Finish();
bool Clean();
- CacheDB(string const &DB) : Dbp(0), Fd(NULL), DebFile(0) {ReadyDB(DB);};
- ~CacheDB() {ReadyDB(string()); delete DebFile;};
+ CacheDB(std::string const &DB) : Dbp(0), Fd(NULL), DebFile(0) {ReadyDB(DB);};
+ ~CacheDB() {ReadyDB(std::string()); delete DebFile;};
};
#endif
diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index eadced626..bbc5a1e2b 100644
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -33,9 +33,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include "contents.h"
+#include <config.h>
-#include <apti18n.h>
#include <apt-pkg/debfile.h>
#include <apt-pkg/extracttar.h>
#include <apt-pkg/error.h>
@@ -43,6 +42,9 @@
#include <stdlib.h>
#include <string.h>
#include <malloc.h>
+
+#include <apti18n.h>
+#include "contents.h"
/*}}}*/
// GenContents::~GenContents - Free allocated memory /*{{{*/
@@ -347,7 +349,7 @@ bool ContentsExtract::DoItem(Item &Itm,int &Fd)
// ContentsExtract::TakeContents - Load the contents data /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool ContentsExtract::TakeContents(const void *NewData,unsigned long Length)
+bool ContentsExtract::TakeContents(const void *NewData,unsigned long long Length)
{
if (Length == 0)
{
@@ -378,7 +380,7 @@ bool ContentsExtract::TakeContents(const void *NewData,unsigned long Length)
// ContentsExtract::Add - Read the contents data into the sorter /*{{{*/
// ---------------------------------------------------------------------
/* */
-void ContentsExtract::Add(GenContents &Contents,string const &Package)
+void ContentsExtract::Add(GenContents &Contents,std::string const &Package)
{
const char *Start = Data;
char *Pkg = Contents.Mystrdup(Package.c_str());
diff --git a/ftparchive/contents.h b/ftparchive/contents.h
index 5b5092b66..4af9db574 100644
--- a/ftparchive/contents.h
+++ b/ftparchive/contents.h
@@ -12,9 +12,10 @@
#include <stdlib.h>
#include <stdio.h>
-#include <apt-pkg/debfile.h>
#include <apt-pkg/dirstream.h>
+class debDebFile;
+
class GenContents
{
struct Node
@@ -71,16 +72,16 @@ class ContentsExtract : public pkgDirStream
// The Data Block
char *Data;
- unsigned long MaxSize;
- unsigned long CurSize;
+ unsigned long long MaxSize;
+ unsigned long long CurSize;
void AddData(const char *Text);
bool Read(debDebFile &Deb);
virtual bool DoItem(Item &Itm,int &Fd);
void Reset() {CurSize = 0;};
- bool TakeContents(const void *Data,unsigned long Length);
- void Add(GenContents &Contents,string const &Package);
+ bool TakeContents(const void *Data,unsigned long long Length);
+ void Add(GenContents &Contents,std::string const &Package);
ContentsExtract() : Data(0), MaxSize(0), CurSize(0) {};
virtual ~ContentsExtract() {delete [] Data;};
diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index 08853b0aa..bf0f858d9 100644
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -14,18 +14,20 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include "multicompress.h"
-
-#include <apti18n.h>
+#include <config.h>
+
#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/md5.h>
-
+
#include <sys/types.h>
#include <sys/stat.h>
#include <utime.h>
#include <unistd.h>
-#include <iostream>
+#include <iostream>
+
+#include "multicompress.h"
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -213,7 +215,7 @@ bool MultiCompress::Die()
// MultiCompress::Finalize - Finish up writing /*{{{*/
// ---------------------------------------------------------------------
/* This is only necessary for statistics reporting. */
-bool MultiCompress::Finalize(unsigned long &OutSize)
+bool MultiCompress::Finalize(unsigned long long &OutSize)
{
OutSize = 0;
if (Input == 0 || Die() == false)
@@ -381,7 +383,7 @@ bool MultiCompress::Child(int const &FD)
stash a hash of the data to use later. */
SetNonBlock(FD,false);
unsigned char Buffer[32*1024];
- unsigned long FileSize = 0;
+ unsigned long long FileSize = 0;
MD5Summation MD5;
while (1)
{
@@ -443,7 +445,7 @@ bool MultiCompress::Child(int const &FD)
// Compute the hash
MD5Summation OldMD5;
- unsigned long NewFileSize = 0;
+ unsigned long long NewFileSize = 0;
while (1)
{
int Res = read(CompFd,Buffer,sizeof(Buffer));
diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h
index 19dede174..5496b06d0 100644
--- a/ftparchive/multicompress.h
+++ b/ftparchive/multicompress.h
@@ -16,11 +16,10 @@
#ifndef MULTICOMPRESS_H
#define MULTICOMPRESS_H
-
-
-#include <string>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/aptconfiguration.h>
+
+#include <string>
#include <stdio.h>
#include <sys/types.h>
@@ -29,7 +28,7 @@ class MultiCompress
// An output file
struct Files
{
- string Output;
+ std::string Output;
APT::Configuration::Compressor CompressProg;
Files *Next;
FileFd TmpFile;
@@ -54,12 +53,12 @@ class MultiCompress
FILE *Input;
unsigned long UpdateMTime;
- bool Finalize(unsigned long &OutSize);
+ bool Finalize(unsigned long long &OutSize);
bool OpenOld(int &Fd,pid_t &Proc);
bool CloseOld(int Fd,pid_t Proc);
- static bool GetStat(string const &Output,string const &Compress,struct stat &St);
+ static bool GetStat(std::string const &Output,std::string const &Compress,struct stat &St);
- MultiCompress(string const &Output,string const &Compress,
+ MultiCompress(std::string const &Output,std::string const &Compress,
mode_t const &Permissions, bool const &Write = true);
~MultiCompress();
};
diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index bd583a66f..d363fd0fe 100644
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -10,14 +10,14 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include "override.h"
-
+#include <config.h>
+
#include <apti18n.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
#include <stdio.h>
-
+
#include "override.h"
/*}}}*/
@@ -34,7 +34,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
char Line[500];
- unsigned long Counter = 0;
+ unsigned long long Counter = 0;
while (fgets(Line,sizeof(Line),F) != 0)
{
Counter++;
@@ -57,7 +57,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
for (; isspace(*End) == 0 && *End != 0; End++);
if (*End == 0)
{
- _error->Warning(_("Malformed override %s line %lu #1"),File.c_str(),
+ _error->Warning(_("Malformed override %s line %llu #1"),File.c_str(),
Counter);
continue;
}
@@ -71,7 +71,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
for (; isspace(*End) == 0 && *End != 0; End++);
if (*End == 0)
{
- _error->Warning(_("Malformed override %s line %lu #2"),File.c_str(),
+ _error->Warning(_("Malformed override %s line %llu #2"),File.c_str(),
Counter);
continue;
}
@@ -85,7 +85,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
for (; isspace(*End) == 0 && *End != 0; End++);
if (*End == 0)
{
- _error->Warning(_("Malformed override %s line %lu #3"),File.c_str(),
+ _error->Warning(_("Malformed override %s line %llu #3"),File.c_str(),
Counter);
continue;
}
@@ -142,7 +142,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source)
return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
char Line[500];
- unsigned long Counter = 0;
+ unsigned long long Counter = 0;
while (fgets(Line,sizeof(Line),F) != 0)
{
Counter++;
@@ -163,7 +163,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source)
for (; isspace(*End) == 0 && *End != 0; End++);
if (*End == 0)
{
- _error->Warning(_("Malformed override %s line %lu #1"),File.c_str(),
+ _error->Warning(_("Malformed override %s line %llu #1"),File.c_str(),
Counter);
continue;
}
@@ -175,7 +175,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source)
for (; isspace(*End) == 0 && *End != 0; End++);
if (*End == 0)
{
- _error->Warning(_("Malformed override %s line %lu #2"),File.c_str(),
+ _error->Warning(_("Malformed override %s line %llu #2"),File.c_str(),
Counter);
continue;
}
@@ -188,7 +188,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source)
for (; isspace(*(End-1)) && End > Value; End--);
if (End == Value)
{
- _error->Warning(_("Malformed override %s line %lu #3"),File.c_str(),
+ _error->Warning(_("Malformed override %s line %llu #3"),File.c_str(),
Counter);
continue;
}
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 9741aec78..27e53faf8 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -11,9 +11,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include "writer.h"
-
-#include <apti18n.h>
+#include <config.h>
+
#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
@@ -30,10 +29,13 @@
#include <iostream>
#include <sstream>
#include <memory>
-
+
+#include "writer.h"
#include "cachedb.h"
#include "apt-ftparchive.h"
#include "multicompress.h"
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
FTWScanner *FTWScanner::Owner;
@@ -246,8 +248,8 @@ bool FTWScanner::LoadFileList(string const &Dir, string const &File)
// ---------------------------------------------------------------------
/* */
bool FTWScanner::Delink(string &FileName,const char *OriginalPath,
- unsigned long &DeLinkBytes,
- off_t const &FileSize)
+ unsigned long long &DeLinkBytes,
+ unsigned long long const &FileSize)
{
// See if this isn't an internaly prefix'd file name.
if (InternalPrefix.empty() == false &&
@@ -377,7 +379,7 @@ bool PackagesWriter::DoPackage(string FileName)
return false;
}
- off_t FileSize = Db.GetFileSize();
+ unsigned long long FileSize = Db.GetFileSize();
if (Delink(FileName,OriginalPath,Stats.DeLinkBytes,FileSize) == false)
return false;
@@ -413,7 +415,7 @@ bool PackagesWriter::DoPackage(string FileName)
}
char Size[40];
- sprintf(Size,"%lu", (unsigned long) FileSize);
+ sprintf(Size,"%llu", (unsigned long long) FileSize);
// Strip the DirStrip prefix from the FileName and add the PathPrefix
string NewFileName;
@@ -610,7 +612,7 @@ bool SourcesWriter::DoPackage(string FileName)
if (St.st_size > 128*1024)
return _error->Error("DSC file '%s' is too large!",FileName.c_str());
- if (BufSize < (unsigned)St.st_size+1)
+ if (BufSize < (unsigned long long)St.st_size+1)
{
BufSize = St.st_size+1;
Buffer = (char *)realloc(Buffer,St.st_size+1);
@@ -1065,7 +1067,7 @@ void ReleaseWriter::Finish()
for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin();
I != CheckSums.end(); ++I)
{
- fprintf(Output, " %s %16ld %s\n",
+ fprintf(Output, " %s %16llu %s\n",
(*I).second.MD5.c_str(),
(*I).second.size,
(*I).first.c_str());
@@ -1077,7 +1079,7 @@ void ReleaseWriter::Finish()
for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin();
I != CheckSums.end(); ++I)
{
- fprintf(Output, " %s %16ld %s\n",
+ fprintf(Output, " %s %16llu %s\n",
(*I).second.SHA1.c_str(),
(*I).second.size,
(*I).first.c_str());
@@ -1089,7 +1091,7 @@ void ReleaseWriter::Finish()
for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin();
I != CheckSums.end(); ++I)
{
- fprintf(Output, " %s %16ld %s\n",
+ fprintf(Output, " %s %16llu %s\n",
(*I).second.SHA256.c_str(),
(*I).second.size,
(*I).first.c_str());
@@ -1101,7 +1103,7 @@ void ReleaseWriter::Finish()
I != CheckSums.end();
++I)
{
- fprintf(Output, " %s %32ld %s\n",
+ fprintf(Output, " %s %16llu %s\n",
(*I).second.SHA512.c_str(),
(*I).second.size,
(*I).first.c_str());
diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index c6026e954..76a3dfd1e 100644
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -22,7 +22,6 @@
#include <set>
#include "cachedb.h"
-#include "multicompress.h"
#include "override.h"
#include "apt-ftparchive.h"
@@ -31,7 +30,7 @@ using std::cout;
using std::endl;
using std::vector;
using std::map;
-
+
class FTWScanner
{
protected:
@@ -48,7 +47,7 @@ class FTWScanner
static int ScannerFile(const char *File, bool const &ReadLink);
bool Delink(string &FileName,const char *OriginalPath,
- unsigned long &Bytes,off_t const &FileSize);
+ unsigned long long &Bytes,unsigned long long const &FileSize);
inline void NewLine(unsigned const &Priority)
{
@@ -81,6 +80,8 @@ class FTWScanner
virtual ~FTWScanner() {};
};
+class MultiCompress;
+
class TranslationWriter
{
MultiCompress *Comp;
@@ -159,7 +160,7 @@ class SourcesWriter : public FTWScanner
Override BOver;
Override SOver;
char *Buffer;
- unsigned long BufSize;
+ unsigned long long BufSize;
public:
@@ -198,7 +199,7 @@ protected:
string SHA256;
string SHA512;
// Limited by FileFd::Size()
- unsigned long size;
+ unsigned long long size;
~CheckSum() {};
};
map<string,struct CheckSum> CheckSums;
diff --git a/methods/bzip2.cc b/methods/bzip2.cc
index 42932dded..8e7e46557 100644
--- a/methods/bzip2.cc
+++ b/methods/bzip2.cc
@@ -13,11 +13,14 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/fileutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/hashes.h>
+#include <apt-pkg/configuration.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -45,9 +48,9 @@ class Bzip2Method : public pkgAcqMethod
bool Bzip2Method::Fetch(FetchItem *Itm)
{
URI Get = Itm->Uri;
- string Path = Get.Host + Get.Path; // To account for relative paths
+ std::string Path = Get.Host + Get.Path; // To account for relative paths
- string GzPathOption = "Dir::bin::"+string(Prog);
+ std::string GzPathOption = "Dir::bin::" + std::string(Prog);
FetchResult Res;
Res.Filename = Itm->DestFile;
@@ -76,7 +79,7 @@ bool Bzip2Method::Fetch(FetchItem *Itm)
SetCloseExec(STDOUT_FILENO,false);
const char *Args[3];
- string Tmp = _config->Find(GzPathOption,Prog);
+ std::string Tmp = _config->Find(GzPathOption,Prog);
Args[0] = Tmp.c_str();
Args[1] = "-d";
Args[2] = 0;
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index ae699dfc3..e7114b168 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -8,12 +8,15 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/cdrom.h>
#include <apt-pkg/cdromutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
#include <apt-pkg/hashes.h>
#include <sys/stat.h>
diff --git a/methods/connect.cc b/methods/connect.cc
index a5af1f1a6..9a092a43c 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -11,9 +11,12 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include "connect.h"
+#include <config.h>
+
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/acquire-method.h>
#include <stdio.h>
#include <errno.h>
@@ -29,17 +32,18 @@
#include <arpa/inet.h>
#include <netdb.h>
+#include "connect.h"
#include "rfc2553emu.h"
#include <apti18n.h>
/*}}}*/
-static string LastHost;
+static std::string LastHost;
static int LastPort = 0;
static struct addrinfo *LastHostAddr = 0;
static struct addrinfo *LastUsed = 0;
// Set of IP/hostnames that we timed out before or couldn't resolve
-static std::set<string> bad_addr;
+static std::set<std::string> bad_addr;
// RotateDNS - Select a new server from a DNS rotation /*{{{*/
// ---------------------------------------------------------------------
@@ -56,7 +60,7 @@ void RotateDNS()
// DoConnect - Attempt a connect operation /*{{{*/
// ---------------------------------------------------------------------
/* This helper function attempts a connection to a single address. */
-static bool DoConnect(struct addrinfo *Addr,string Host,
+static bool DoConnect(struct addrinfo *Addr,std::string Host,
unsigned long TimeOut,int &Fd,pkgAcqMethod *Owner)
{
// Show a status indicator
@@ -71,7 +75,7 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
Owner->Status(_("Connecting to %s (%s)"),Host.c_str(),Name);
// if that addr did timeout before, we do not try it again
- if(bad_addr.find(string(Name)) != bad_addr.end())
+ if(bad_addr.find(std::string(Name)) != bad_addr.end())
return false;
/* If this is an IP rotation store the IP we are using.. If something goes
@@ -98,7 +102,7 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
/* This implements a timeout for connect by opening the connection
nonblocking */
if (WaitFd(Fd,true,TimeOut) == false) {
- bad_addr.insert(bad_addr.begin(), string(Name));
+ bad_addr.insert(bad_addr.begin(), std::string(Name));
Owner->SetFailReason("Timeout");
return _error->Error(_("Could not connect to %s:%s (%s), "
"connection timed out"),Host.c_str(),Service,Name);
@@ -117,7 +121,7 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
Owner->SetFailReason("ConnectionRefused");
else if (errno == ETIMEDOUT)
Owner->SetFailReason("ConnectionTimedOut");
- bad_addr.insert(bad_addr.begin(), string(Name));
+ bad_addr.insert(bad_addr.begin(), std::string(Name));
return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
Service,Name);
}
@@ -128,7 +132,7 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
// Connect - Connect to a server /*{{{*/
// ---------------------------------------------------------------------
/* Performs a connection to the server */
-bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
+bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd,
unsigned long TimeOut,pkgAcqMethod *Owner)
{
if (_error->PendingError() == true)
diff --git a/methods/connect.h b/methods/connect.h
index 6f208e31d..bbe1bb35d 100644
--- a/methods/connect.h
+++ b/methods/connect.h
@@ -11,9 +11,10 @@
#define CONNECT_H
#include <string>
-#include <apt-pkg/acquire-method.h>
-bool Connect(string To,int Port,const char *Service,int DefPort,
+class pkgAcqMethod;
+
+bool Connect(std::string To,int Port,const char *Service,int DefPort,
int &Fd,unsigned long TimeOut,pkgAcqMethod *Owner);
void RotateDNS();
diff --git a/methods/copy.cc b/methods/copy.cc
index a6bb372a3..f8d58e479 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -9,7 +9,10 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
@@ -35,7 +38,7 @@ class CopyMethod : public pkgAcqMethod
bool CopyMethod::Fetch(FetchItem *Itm)
{
URI Get = Itm->Uri;
- string File = Get.Path;
+ std::string File = Get.Path;
// Stat the file and send a start message
struct stat Buf;
diff --git a/methods/file.cc b/methods/file.cc
index 9cdd5bc2d..5025c996d 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -13,10 +13,13 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -38,7 +41,7 @@ class FileMethod : public pkgAcqMethod
bool FileMethod::Fetch(FetchItem *Itm)
{
URI Get = Itm->Uri;
- string File = Get.Path;
+ std::string File = Get.Path;
FetchResult Res;
if (Get.Host.empty() == false)
return _error->Error(_("Invalid URI, local URIS must not start with //"));
@@ -56,10 +59,10 @@ bool FileMethod::Fetch(FetchItem *Itm)
}
// See if we can compute a file without a .gz exentsion
- string::size_type Pos = File.rfind(".gz");
+ std::string::size_type Pos = File.rfind(".gz");
if (Pos + 3 == File.length())
{
- File = string(File,0,Pos);
+ File = std::string(File,0,Pos);
if (stat(File.c_str(),&Buf) == 0)
{
FetchResult AltRes;
diff --git a/methods/ftp.cc b/methods/ftp.cc
index eb7fedd85..2ca0ac6f7 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -15,11 +15,14 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/fileutl.h>
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
#include <apt-pkg/netrc.h>
+#include <apt-pkg/configuration.h>
#include <sys/stat.h>
#include <sys/time.h>
@@ -30,7 +33,6 @@
#include <errno.h>
#include <stdarg.h>
#include <iostream>
-#include <apti18n.h>
// Internet stuff
#include <netinet/in.h>
@@ -41,6 +43,7 @@
#include "rfc2553emu.h"
#include "connect.h"
#include "ftp.h"
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -628,7 +631,7 @@ bool FTPConn::ExtGoPasv()
// FTPConn::Size - Return the size of a file /*{{{*/
// ---------------------------------------------------------------------
/* Grab the file size from the server, 0 means no size or empty file */
-bool FTPConn::Size(const char *Path,unsigned long &Size)
+bool FTPConn::Size(const char *Path,unsigned long long &Size)
{
// Query the size
unsigned int Tag;
@@ -638,7 +641,7 @@ bool FTPConn::Size(const char *Path,unsigned long &Size)
return false;
char *End;
- Size = strtol(Msg.c_str(),&End,10);
+ Size = strtoull(Msg.c_str(),&End,10);
if (Tag >= 400 || End == Msg.c_str())
Size = 0;
return true;
@@ -840,7 +843,7 @@ bool FTPConn::Finalize()
// ---------------------------------------------------------------------
/* This opens a data connection, sends REST and RETR and then
transfers the file over. */
-bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume,
+bool FTPConn::Get(const char *Path,FileFd &To,unsigned long long Resume,
Hashes &Hash,bool &Missing)
{
Missing = false;
@@ -1003,7 +1006,7 @@ bool FtpMethod::Fetch(FetchItem *Itm)
// Get the files information
Status(_("Query"));
- unsigned long Size;
+ unsigned long long Size;
if (Server->Size(File,Size) == false ||
Server->ModTime(File,FailTime) == false)
{
@@ -1025,7 +1028,7 @@ bool FtpMethod::Fetch(FetchItem *Itm)
struct stat Buf;
if (stat(Itm->DestFile.c_str(),&Buf) == 0)
{
- if (Size == (unsigned)Buf.st_size && FailTime == Buf.st_mtime)
+ if (Size == (unsigned long long)Buf.st_size && FailTime == Buf.st_mtime)
{
Res.Size = Buf.st_size;
Res.LastModified = Buf.st_mtime;
@@ -1035,7 +1038,7 @@ bool FtpMethod::Fetch(FetchItem *Itm)
}
// Resume?
- if (FailTime == Buf.st_mtime && Size > (unsigned)Buf.st_size)
+ if (FailTime == Buf.st_mtime && Size > (unsigned long long)Buf.st_size)
Res.ResumePoint = Buf.st_size;
}
diff --git a/methods/ftp.h b/methods/ftp.h
index d7f1f7fbe..2634f0732 100644
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -10,6 +10,10 @@
#ifndef APT_FTP_H
#define APT_FTP_H
+#include <apt-pkg/strutl.h>
+
+#include <string>
+
class FTPConn
{
char Buffer[1024*10];
@@ -33,7 +37,7 @@ class FTPConn
socklen_t ServerAddrLen;
// Private helper functions
- bool ReadLine(string &Text);
+ bool ReadLine(std::string &Text);
bool Login();
bool CreateDataFd();
bool Finalize();
@@ -43,8 +47,8 @@ class FTPConn
bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port && Other.User == ServerName.User && Other.Password == ServerName.Password; };
// Raw connection IO
- bool ReadResp(unsigned int &Ret,string &Text);
- bool WriteMsg(unsigned int &Ret,string &Text,const char *Fmt,...);
+ bool ReadResp(unsigned int &Ret,std::string &Text);
+ bool WriteMsg(unsigned int &Ret,std::string &Text,const char *Fmt,...);
// Connection control
bool Open(pkgAcqMethod *Owner);
@@ -53,9 +57,9 @@ class FTPConn
bool ExtGoPasv();
// Query
- bool Size(const char *Path,unsigned long &Size);
+ bool Size(const char *Path,unsigned long long &Size);
bool ModTime(const char *Path, time_t &Time);
- bool Get(const char *Path,FileFd &To,unsigned long Resume,
+ bool Get(const char *Path,FileFd &To,unsigned long long Resume,
Hashes &MD5,bool &Missing);
FTPConn(URI Srv);
@@ -65,11 +69,11 @@ class FTPConn
class FtpMethod : public pkgAcqMethod
{
virtual bool Fetch(FetchItem *Itm);
- virtual bool Configuration(string Message);
+ virtual bool Configuration(std::string Message);
FTPConn *Server;
- static string FailFile;
+ static std::string FailFile;
static int FailFd;
static time_t FailTime;
static void SigTerm(int);
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 3ad3e8d84..2b2aba017 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,9 +1,11 @@
+#include <config.h>
+
#include <apt-pkg/error.h>
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/indexcopy.h>
-#include <apti18n.h>
+#include <apt-pkg/configuration.h>
#include <utime.h>
#include <stdio.h>
@@ -12,9 +14,13 @@
#include <sys/wait.h>
#include <iostream>
#include <sstream>
-
#include <vector>
+#include <apti18n.h>
+
+using std::string;
+using std::vector;
+
#define GNUPGPREFIX "[GNUPG:]"
#define GNUPGBADSIG "[GNUPG:] BADSIG"
#define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY"
diff --git a/methods/gzip.cc b/methods/gzip.cc
index fc4e1ecfd..a51497948 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -9,6 +9,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/fileutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/acquire-method.h>
@@ -39,7 +41,7 @@ class GzipMethod : public pkgAcqMethod
bool GzipMethod::Fetch(FetchItem *Itm)
{
URI Get = Itm->Uri;
- string Path = Get.Host + Get.Path; // To account for relative paths
+ std::string Path = Get.Host + Get.Path; // To account for relative paths
FetchResult Res;
Res.Filename = Itm->DestFile;
@@ -62,7 +64,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
while (1)
{
unsigned char Buffer[4*1024];
- unsigned long Count;
+ unsigned long long Count = 0;
if (!From.Read(Buffer,sizeof(Buffer),&Count))
{
diff --git a/methods/http.cc b/methods/http.cc
index 65a0cbbb7..0d81c73ed 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -25,8 +25,11 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/fileutl.h>
#include <apt-pkg/acquire-method.h>
+#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
#include <apt-pkg/netrc.h>
@@ -41,8 +44,6 @@
#include <string.h>
#include <iostream>
#include <map>
-#include <apti18n.h>
-
// Internet stuff
#include <netdb.h>
@@ -51,6 +52,8 @@
#include "connect.h"
#include "rfc2553emu.h"
#include "http.h"
+
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -63,15 +66,15 @@ bool AllowRedirect = false;
bool Debug = false;
URI Proxy;
-unsigned long CircleBuf::BwReadLimit=0;
-unsigned long CircleBuf::BwTickReadData=0;
+unsigned long long CircleBuf::BwReadLimit=0;
+unsigned long long CircleBuf::BwTickReadData=0;
struct timeval CircleBuf::BwReadTick={0,0};
const unsigned int CircleBuf::BW_HZ=10;
// CircleBuf::CircleBuf - Circular input buffer /*{{{*/
// ---------------------------------------------------------------------
/* */
-CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0)
+CircleBuf::CircleBuf(unsigned long long Size) : Size(Size), Hash(0)
{
Buf = new unsigned char[Size];
Reset();
@@ -87,7 +90,7 @@ void CircleBuf::Reset()
InP = 0;
OutP = 0;
StrPos = 0;
- MaxGet = (unsigned int)-1;
+ MaxGet = (unsigned long long)-1;
OutQueue = string();
if (Hash != 0)
{
@@ -102,7 +105,7 @@ void CircleBuf::Reset()
is non-blocking.. */
bool CircleBuf::Read(int Fd)
{
- unsigned long BwReadMax;
+ unsigned long long BwReadMax;
while (1)
{
@@ -117,7 +120,7 @@ bool CircleBuf::Read(int Fd)
struct timeval now;
gettimeofday(&now,0);
- unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 +
+ unsigned long long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 +
now.tv_usec-CircleBuf::BwReadTick.tv_usec;
if(d > 1000000/BW_HZ) {
CircleBuf::BwReadTick = now;
@@ -131,7 +134,7 @@ bool CircleBuf::Read(int Fd)
}
// Write the buffer segment
- int Res;
+ ssize_t Res;
if(CircleBuf::BwReadLimit) {
Res = read(Fd,Buf + (InP%Size),
BwReadMax > LeftRead() ? LeftRead() : BwReadMax);
@@ -180,7 +183,7 @@ void CircleBuf::FillOut()
return;
// Write the buffer segment
- unsigned long Sz = LeftRead();
+ unsigned long long Sz = LeftRead();
if (OutQueue.length() - StrPos < Sz)
Sz = OutQueue.length() - StrPos;
memcpy(Buf + (InP%Size),OutQueue.c_str() + StrPos,Sz);
@@ -214,7 +217,7 @@ bool CircleBuf::Write(int Fd)
return true;
// Write the buffer segment
- int Res;
+ ssize_t Res;
Res = write(Fd,Buf + (OutP%Size),LeftWrite());
if (Res == 0)
@@ -240,7 +243,7 @@ bool CircleBuf::Write(int Fd)
bool CircleBuf::WriteTillEl(string &Data,bool Single)
{
// We cheat and assume it is unneeded to have more than one buffer load
- for (unsigned long I = OutP; I < InP; I++)
+ for (unsigned long long I = OutP; I < InP; I++)
{
if (Buf[I%Size] != '\n')
continue;
@@ -258,7 +261,7 @@ bool CircleBuf::WriteTillEl(string &Data,bool Single)
Data = "";
while (OutP < I)
{
- unsigned long Sz = LeftWrite();
+ unsigned long long Sz = LeftWrite();
if (Sz == 0)
return false;
if (I - OutP < Sz)
@@ -286,6 +289,11 @@ void CircleBuf::Stats()
clog << "Got " << InP << " in " << Diff << " at " << InP/Diff << endl;*/
}
/*}}}*/
+CircleBuf::~CircleBuf()
+{
+ delete [] Buf;
+ delete Hash;
+}
// ServerState::ServerState - Constructor /*{{{*/
// ---------------------------------------------------------------------
@@ -453,7 +461,7 @@ bool ServerState::RunData()
return false;
// See if we are done
- unsigned long Len = strtol(Data.c_str(),0,16);
+ unsigned long long Len = strtoull(Data.c_str(),0,16);
if (Len == 0)
{
In.Limit(-1);
@@ -596,7 +604,7 @@ bool ServerState::HeaderLine(string Line)
if (StartPos != 0)
return true;
- if (sscanf(Val.c_str(),"%lu",&Size) != 1)
+ if (sscanf(Val.c_str(),"%llu",&Size) != 1)
return _error->Error(_("The HTTP server sent an invalid Content-Length header"));
return true;
}
@@ -611,9 +619,9 @@ bool ServerState::HeaderLine(string Line)
{
HaveContent = true;
- if (sscanf(Val.c_str(),"bytes %lu-%*u/%lu",&StartPos,&Size) != 2)
+ if (sscanf(Val.c_str(),"bytes %llu-%*u/%llu",&StartPos,&Size) != 2)
return _error->Error(_("The HTTP server sent an invalid Content-Range header"));
- if ((unsigned)StartPos > Size)
+ if ((unsigned long long)StartPos > Size)
return _error->Error(_("This HTTP server has broken range support"));
return true;
}
@@ -716,7 +724,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
{
// In this case we send an if-range query with a range header
- sprintf(Buf,"Range: bytes=%li-\r\nIf-Range: %s\r\n",(long)SBuf.st_size - 1,
+ sprintf(Buf,"Range: bytes=%lli-\r\nIf-Range: %s\r\n",(long long)SBuf.st_size - 1,
TimeRFC1123(SBuf.st_mtime).c_str());
Req += Buf;
}
diff --git a/methods/http.h b/methods/http.h
index 6302807c5..c73d4df5c 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -13,39 +13,42 @@
#define MAXLEN 360
-#include <apt-pkg/hashes.h>
+#include <apt-pkg/strutl.h>
+
+#include <string>
using std::cout;
using std::endl;
class HttpMethod;
+class Hashes;
class CircleBuf
{
unsigned char *Buf;
- unsigned long Size;
- unsigned long InP;
- unsigned long OutP;
- string OutQueue;
- unsigned long StrPos;
- unsigned long MaxGet;
+ unsigned long long Size;
+ unsigned long long InP;
+ unsigned long long OutP;
+ std::string OutQueue;
+ unsigned long long StrPos;
+ unsigned long long MaxGet;
struct timeval Start;
- static unsigned long BwReadLimit;
- static unsigned long BwTickReadData;
+ static unsigned long long BwReadLimit;
+ static unsigned long long BwTickReadData;
static struct timeval BwReadTick;
static const unsigned int BW_HZ;
- unsigned long LeftRead() const
+ unsigned long long LeftRead() const
{
- unsigned long Sz = Size - (InP - OutP);
+ unsigned long long Sz = Size - (InP - OutP);
if (Sz > Size - (InP%Size))
Sz = Size - (InP%Size);
return Sz;
}
- unsigned long LeftWrite() const
+ unsigned long long LeftWrite() const
{
- unsigned long Sz = InP - OutP;
+ unsigned long long Sz = InP - OutP;
if (InP > MaxGet)
Sz = MaxGet - OutP;
if (Sz > Size - (OutP%Size))
@@ -60,14 +63,14 @@ class CircleBuf
// Read data in
bool Read(int Fd);
- bool Read(string Data);
+ bool Read(std::string Data);
// Write data out
bool Write(int Fd);
- bool WriteTillEl(string &Data,bool Single = false);
+ bool WriteTillEl(std::string &Data,bool Single = false);
// Control the write limit
- void Limit(long Max) {if (Max == -1) MaxGet = 0-1; else MaxGet = OutP + Max;}
+ void Limit(long long Max) {if (Max == -1) MaxGet = 0-1; else MaxGet = OutP + Max;}
bool IsLimit() const {return MaxGet == OutP;};
void Print() const {cout << MaxGet << ',' << OutP << endl;};
@@ -79,8 +82,8 @@ class CircleBuf
void Reset();
void Stats();
- CircleBuf(unsigned long Size);
- ~CircleBuf() {delete [] Buf; delete Hash;};
+ CircleBuf(unsigned long long Size);
+ ~CircleBuf();
};
struct ServerState
@@ -92,14 +95,14 @@ struct ServerState
char Code[MAXLEN];
// These are some statistics from the last parsed header lines
- unsigned long Size;
- signed long StartPos;
+ unsigned long long Size;
+ signed long long StartPos;
time_t Date;
bool HaveContent;
enum {Chunked,Stream,Closes} Encoding;
enum {Header, Data} State;
bool Persistent;
- string Location;
+ std::string Location;
// This is a Persistent attribute of the server itself.
bool Pipeline;
@@ -112,7 +115,7 @@ struct ServerState
int ServerFd;
URI ServerName;
- bool HeaderLine(string Line);
+ bool HeaderLine(std::string Line);
bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
void Reset() {Major = 0; Minor = 0; Result = 0; Size = 0; StartPos = 0;
Encoding = Closes; time(&Date); ServerFd = -1;
@@ -167,10 +170,10 @@ class HttpMethod : public pkgAcqMethod
/** \brief Try to AutoDetect the proxy */
bool AutoDetectProxy();
- virtual bool Configuration(string Message);
+ virtual bool Configuration(std::string Message);
// In the event of a fatal signal this file will be closed and timestamped.
- static string FailFile;
+ static std::string FailFile;
static int FailFd;
static time_t FailTime;
static void SigTerm(int);
@@ -178,8 +181,8 @@ class HttpMethod : public pkgAcqMethod
protected:
virtual bool Fetch(FetchItem *);
- string NextURI;
- string AutoDetectProxyCmd;
+ std::string NextURI;
+ std::string AutoDetectProxyCmd;
public:
friend struct ServerState;
diff --git a/methods/http_main.cc b/methods/http_main.cc
index 7815c2fc1..2ca91bfc9 100644
--- a/methods/http_main.cc
+++ b/methods/http_main.cc
@@ -1,3 +1,5 @@
+#include <config.h>
+
#include <apt-pkg/fileutl.h>
#include <apt-pkg/acquire-method.h>
#include <signal.h>
diff --git a/methods/https.cc b/methods/https.cc
index 668a329e6..335699907 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -10,11 +10,14 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/fileutl.h>
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
#include <apt-pkg/netrc.h>
+#include <apt-pkg/configuration.h>
#include <sys/stat.h>
#include <sys/time.h>
@@ -25,12 +28,11 @@
#include <errno.h>
#include <string.h>
#include <iostream>
-#include <apti18n.h>
#include <sstream>
#include "config.h"
#include "https.h"
-
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -51,7 +53,7 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow,
{
HttpsMethod *me = (HttpsMethod *)clientp;
if(dltotal > 0 && me->Res.Size == 0) {
- me->Res.Size = (unsigned long)dltotal;
+ me->Res.Size = (unsigned long long)dltotal;
me->URIStart(me->Res);
}
return 0;
diff --git a/methods/https.h b/methods/https.h
index 3f0c416b6..b7adeb880 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -20,7 +20,7 @@ using std::cout;
using std::endl;
class HttpsMethod;
-
+class FileFd;
class HttpsMethod : public pkgAcqMethod
{
@@ -45,6 +45,7 @@ class HttpsMethod : public pkgAcqMethod
};
};
+#include <apt-pkg/strutl.h>
URI Proxy;
#endif
diff --git a/methods/mirror.cc b/methods/mirror.cc
index a3e60ab15..3d5983efa 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -8,6 +8,8 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include <config.h>
+
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/acquire-method.h>
@@ -16,7 +18,8 @@
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
#include <apt-pkg/sourcelist.h>
-
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/metaindex.h>
#include <algorithm>
#include <fstream>
@@ -34,7 +37,7 @@ using namespace std;
#include "mirror.h"
#include "http.h"
-#include "apti18n.h"
+#include <apti18n.h>
/*}}}*/
/* Done:
diff --git a/methods/mirror.h b/methods/mirror.h
index 97d18144a..81e531e21 100644
--- a/methods/mirror.h
+++ b/methods/mirror.h
@@ -11,8 +11,9 @@
#ifndef APT_MIRROR_H
#define APT_MIRROR_H
-
#include <iostream>
+#include <string>
+#include <vector>
using std::cout;
using std::cerr;
@@ -24,29 +25,29 @@ class MirrorMethod : public HttpMethod
{
FetchResult Res;
// we simply transform between BaseUri and Mirror
- string BaseUri; // the original mirror://... url
- string Mirror; // the selected mirror uri (http://...)
- vector<string> AllMirrors; // all available mirrors
- string MirrorFile; // the file that contains the list of mirrors
+ std::string BaseUri; // the original mirror://... url
+ std::string Mirror; // the selected mirror uri (http://...)
+ std::vector<std::string> AllMirrors; // all available mirrors
+ std::string MirrorFile; // the file that contains the list of mirrors
bool DownloadedMirrorFile; // already downloaded this session
- string Dist; // the target distrubtion (e.g. sid, oneiric)
+ std::string Dist; // the target distrubtion (e.g. sid, oneiric)
bool Debug;
protected:
- bool DownloadMirrorFile(string uri);
- bool RandomizeMirrorFile(string file);
- string GetMirrorFileName(string uri);
+ bool DownloadMirrorFile(std::string uri);
+ bool RandomizeMirrorFile(std::string file);
+ std::string GetMirrorFileName(std::string uri);
bool InitMirrors();
bool TryNextMirror();
void CurrentQueueUriToMirror();
- bool Clean(string dir);
+ bool Clean(std::string dir);
// we need to overwrite those to transform the url back
- virtual void Fail(string Why, bool Transient = false);
+ virtual void Fail(std::string Why, bool Transient = false);
virtual void URIStart(FetchResult &Res);
virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0);
- virtual bool Configuration(string Message);
+ virtual bool Configuration(std::string Message);
public:
MirrorMethod();
diff --git a/methods/rfc2553emu.cc b/methods/rfc2553emu.cc
index 66bc906e9..f00e85889 100644
--- a/methods/rfc2553emu.cc
+++ b/methods/rfc2553emu.cc
@@ -14,12 +14,14 @@
##################################################################### */
/*}}}*/
-#include "rfc2553emu.h"
+#include <config.h>
+
#include <stdlib.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <string.h>
#include <stdio.h>
+#include "rfc2553emu.h"
#ifndef HAVE_GETADDRINFO
// getaddrinfo - Resolve a hostname /*{{{*/
diff --git a/methods/rred.cc b/methods/rred.cc
index 6c55880ca..ef00fcaa3 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -1,10 +1,13 @@
// Includes /*{{{*/
+#include <config.h>
+
#include <apt-pkg/fileutl.h>
#include <apt-pkg/mmap.h>
#include <apt-pkg/error.h>
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/hashes.h>
+#include <apt-pkg/configuration.h>
#include <sys/stat.h>
#include <sys/uio.h>
@@ -257,7 +260,7 @@ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From, /*{{{*/
#ifdef _POSIX_MAPPED_FILES
MMap ed_cmds(MMap::ReadOnly);
if (Patch.gzFd() != NULL) {
- unsigned long mapSize = Patch.Size();
+ unsigned long long mapSize = Patch.Size();
DynamicMMap* dyn = new DynamicMMap(0, mapSize, 0);
if (dyn->validData() == false) {
delete dyn;
@@ -470,7 +473,7 @@ bool RredMethod::Fetch(FetchItem *Itm) /*{{{*/
{
Debug = _config->FindB("Debug::pkgAcquire::RRed", false);
URI Get = Itm->Uri;
- string Path = Get.Host + Get.Path; // To account for relative paths
+ std::string Path = Get.Host + Get.Path; // To account for relative paths
FetchResult Res;
Res.Filename = Itm->DestFile;
@@ -523,7 +526,7 @@ bool RredMethod::Fetch(FetchItem *Itm) /*{{{*/
and use the access time from the "old" file */
struct stat BufBase, BufPatch;
if (stat(Path.c_str(),&BufBase) != 0 ||
- stat(string(Path+".ed").c_str(),&BufPatch) != 0)
+ stat(std::string(Path+".ed").c_str(),&BufPatch) != 0)
return _error->Errno("stat",_("Failed to stat"));
struct utimbuf TimeBuf;
diff --git a/methods/rsh.cc b/methods/rsh.cc
index 21f0d0a22..da9777fc4 100644
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -11,8 +11,12 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include "rsh.h"
+#include <config.h>
+
#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/configuration.h>
#include <sys/stat.h>
#include <sys/time.h>
@@ -22,6 +26,8 @@
#include <stdio.h>
#include <errno.h>
#include <stdarg.h>
+#include "rsh.h"
+
#include <apti18n.h>
/*}}}*/
@@ -29,7 +35,7 @@ const char *Prog;
unsigned long TimeOut = 120;
Configuration::Item const *RshOptions = 0;
time_t RSHMethod::FailTime = 0;
-string RSHMethod::FailFile;
+std::string RSHMethod::FailFile;
int RSHMethod::FailFd = -1;
// RSHConn::RSHConn - Constructor /*{{{*/
@@ -82,7 +88,7 @@ bool RSHConn::Open()
// RSHConn::Connect - Fire up rsh and connect /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool RSHConn::Connect(string Host, string User)
+bool RSHConn::Connect(std::string Host, std::string User)
{
// Create the pipes
int Pipes[4] = {-1,-1,-1,-1};
@@ -151,7 +157,7 @@ bool RSHConn::Connect(string Host, string User)
// RSHConn::ReadLine - Very simple buffered read with timeout /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool RSHConn::ReadLine(string &Text)
+bool RSHConn::ReadLine(std::string &Text)
{
if (Process == -1 || ReadFd == -1)
return false;
@@ -171,7 +177,7 @@ bool RSHConn::ReadLine(string &Text)
continue;
I++;
- Text = string(Buffer,I);
+ Text = std::string(Buffer,I);
memmove(Buffer,Buffer+I,Len - I);
Len -= I;
return true;
@@ -202,7 +208,7 @@ bool RSHConn::ReadLine(string &Text)
// ---------------------------------------------------------------------
/* The remote sync flag appends a || echo which will insert blank line
once the command completes. */
-bool RSHConn::WriteMsg(string &Text,bool Sync,const char *Fmt,...)
+bool RSHConn::WriteMsg(std::string &Text,bool Sync,const char *Fmt,...)
{
va_list args;
va_start(args,Fmt);
@@ -248,10 +254,10 @@ bool RSHConn::WriteMsg(string &Text,bool Sync,const char *Fmt,...)
// ---------------------------------------------------------------------
/* Right now for successfull transfer the file size must be known in
advance. */
-bool RSHConn::Size(const char *Path,unsigned long &Size)
+bool RSHConn::Size(const char *Path,unsigned long long &Size)
{
// Query the size
- string Msg;
+ std::string Msg;
Size = 0;
if (WriteMsg(Msg,true,"find %s -follow -printf '%%s\\n'",Path) == false)
@@ -260,7 +266,7 @@ bool RSHConn::Size(const char *Path,unsigned long &Size)
// FIXME: Sense if the bad reply is due to a File Not Found.
char *End;
- Size = strtoul(Msg.c_str(),&End,10);
+ Size = strtoull(Msg.c_str(),&End,10);
if (End == Msg.c_str())
return _error->Error(_("File not found"));
return true;
@@ -273,7 +279,7 @@ bool RSHConn::ModTime(const char *Path, time_t &Time)
{
Time = time(&Time);
// Query the mod time
- string Msg;
+ std::string Msg;
if (WriteMsg(Msg,true,"TZ=UTC find %s -follow -printf '%%TY%%Tm%%Td%%TH%%TM%%TS\\n'",Path) == false)
return false;
@@ -285,8 +291,8 @@ bool RSHConn::ModTime(const char *Path, time_t &Time)
// RSHConn::Get - Get a file /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool RSHConn::Get(const char *Path,FileFd &To,unsigned long Resume,
- Hashes &Hash,bool &Missing, unsigned long Size)
+bool RSHConn::Get(const char *Path,FileFd &To,unsigned long long Resume,
+ Hashes &Hash,bool &Missing, unsigned long long Size)
{
Missing = false;
@@ -306,12 +312,12 @@ bool RSHConn::Get(const char *Path,FileFd &To,unsigned long Resume,
}
// FIXME: Detect file-not openable type errors.
- string Jnk;
+ std::string Jnk;
if (WriteMsg(Jnk,false,"dd if=%s bs=2048 skip=%u", Path, Resume / 2048) == false)
return false;
// Copy loop
- unsigned int MyLen = Resume;
+ unsigned long long MyLen = Resume;
unsigned char Buffer[4096];
while (MyLen < Size)
{
@@ -363,7 +369,7 @@ RSHMethod::RSHMethod() : pkgAcqMethod("1.0",SendConfig)
/*}}}*/
// RSHMethod::Configuration - Handle a configuration message /*{{{*/
// ---------------------------------------------------------------------
-bool RSHMethod::Configuration(string Message)
+bool RSHMethod::Configuration(std::string Message)
{
char ProgStr[100];
@@ -425,7 +431,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
Status(_("Connecting to %s"), Get.Host.c_str());
// Get the files information
- unsigned long Size;
+ unsigned long long Size;
if (Server->Size(File,Size) == false ||
Server->ModTime(File,FailTime) == false)
{
@@ -446,7 +452,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
// See if the file exists
struct stat Buf;
if (stat(Itm->DestFile.c_str(),&Buf) == 0) {
- if (Size == (unsigned)Buf.st_size && FailTime == Buf.st_mtime) {
+ if (Size == (unsigned long long)Buf.st_size && FailTime == Buf.st_mtime) {
Res.Size = Buf.st_size;
Res.LastModified = Buf.st_mtime;
Res.ResumePoint = Buf.st_size;
@@ -455,7 +461,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
}
// Resume?
- if (FailTime == Buf.st_mtime && Size > (unsigned)Buf.st_size)
+ if (FailTime == Buf.st_mtime && Size > (unsigned long long)Buf.st_size)
Res.ResumePoint = Buf.st_size;
}
diff --git a/methods/rsh.h b/methods/rsh.h
index 98ca6a88c..d7efa3f06 100644
--- a/methods/rsh.h
+++ b/methods/rsh.h
@@ -12,9 +12,9 @@
#include <string>
#include <apt-pkg/strutl.h>
-#include <apt-pkg/hashes.h>
-#include <apt-pkg/acquire-method.h>
-#include <apt-pkg/fileutl.h>
+
+class Hashes;
+class FileFd;
class RSHConn
{
@@ -25,15 +25,15 @@ class RSHConn
URI ServerName;
// Private helper functions
- bool ReadLine(string &Text);
+ bool ReadLine(std::string &Text);
public:
pid_t Process;
// Raw connection IO
- bool WriteMsg(string &Text,bool Sync,const char *Fmt,...);
- bool Connect(string Host, string User);
+ bool WriteMsg(std::string &Text,bool Sync,const char *Fmt,...);
+ bool Connect(std::string Host, std::string User);
bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
// Connection control
@@ -41,23 +41,25 @@ class RSHConn
void Close();
// Query
- bool Size(const char *Path,unsigned long &Size);
+ bool Size(const char *Path,unsigned long long &Size);
bool ModTime(const char *Path, time_t &Time);
- bool Get(const char *Path,FileFd &To,unsigned long Resume,
- Hashes &Hash,bool &Missing, unsigned long Size);
+ bool Get(const char *Path,FileFd &To,unsigned long long Resume,
+ Hashes &Hash,bool &Missing, unsigned long long Size);
RSHConn(URI Srv);
~RSHConn();
};
+#include <apt-pkg/acquire-method.h>
+
class RSHMethod : public pkgAcqMethod
{
virtual bool Fetch(FetchItem *Itm);
- virtual bool Configuration(string Message);
+ virtual bool Configuration(std::string Message);
RSHConn *Server;
- static string FailFile;
+ static std::string FailFile;
static int FailFd;
static time_t FailTime;
static void SigTerm(int);
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 245ffce91..c655eb9a6 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-14 11:38+0200\n"
+"POT-Creation-Date: 2011-11-10 16:46+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,149 +17,150 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr ""
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
msgid "Total package names: "
msgstr ""
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
msgid "Total package structures: "
msgstr ""
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
msgid " Normal packages: "
msgstr ""
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
msgid " Pure virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
msgid " Single virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
msgid " Mixed virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
msgid " Missing: "
msgstr ""
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
msgid "Total distinct versions: "
msgstr ""
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
msgid "Total distinct descriptions: "
msgstr ""
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
msgid "Total dependencies: "
msgstr ""
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
msgid "Total ver/file relations: "
msgstr ""
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
msgid "Total Desc/File relations: "
msgstr ""
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
msgid "Total Provides mappings: "
msgstr ""
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
msgid "Total globbed strings: "
msgstr ""
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
msgid "Total dependency version space: "
msgstr ""
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
msgid "Total slack space: "
msgstr ""
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
msgid "Total space accounted for: "
msgstr ""
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:39
+#: cmdline/apt-mark.cc:86 cmdline/apt-mark.cc:162
msgid "No packages found"
msgstr ""
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
msgid "You must give at least one search pattern"
msgstr ""
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:445
#, c-format
msgid "Unable to locate package %s"
msgstr ""
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
msgid "Package files:"
msgstr ""
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
msgid "Pinned packages:"
msgstr ""
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
msgid "(not found)"
msgstr ""
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
msgid " Installed: "
msgstr ""
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
msgid " Candidate: "
msgstr ""
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
msgid "(none)"
msgstr ""
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
msgid " Package pin: "
msgstr ""
#. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3125 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3247 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:266 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1682
+#: cmdline/apt-cache.cc:1686
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -196,28 +197,28 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr ""
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
msgid "Arguments not in pairs"
msgstr ""
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
msgid ""
"Usage: apt-config [options] command\n"
"\n"
@@ -233,12 +234,12 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr ""
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -252,40 +253,40 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1269
#, c-format
msgid "Unable to write to %s"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
msgid "Package extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
+#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
+#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
#, c-format
msgid "Error processing directory %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
msgid "Source extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
msgid "Error writing header to contents file"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
#, c-format
msgid "Error processing contents %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -327,136 +328,136 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
msgid "No selections matched"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr ""
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr ""
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr ""
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr ""
-#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
-#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
#, c-format
msgid "Failed to stat %s"
msgstr ""
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
msgid "Archive has no control record"
msgstr ""
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ""
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr ""
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr ""
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr ""
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
msgid "realloc - Failed to allocate memory"
msgstr ""
@@ -467,17 +468,17 @@ msgstr ""
#: ftparchive/override.cc:60 ftparchive/override.cc:166
#, c-format
-msgid "Malformed override %s line %lu #1"
+msgid "Malformed override %s line %llu #1"
msgstr ""
#: ftparchive/override.cc:74 ftparchive/override.cc:178
#, c-format
-msgid "Malformed override %s line %lu #2"
+msgid "Malformed override %s line %llu #2"
msgstr ""
#: ftparchive/override.cc:88 ftparchive/override.cc:191
#, c-format
-msgid "Malformed override %s line %lu #3"
+msgid "Malformed override %s line %llu #3"
msgstr ""
#: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -485,63 +486,63 @@ msgstr ""
msgid "Failed to read the override file %s"
msgstr ""
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:69
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr ""
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:99
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr ""
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:167 methods/rsh.cc:97
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:193
msgid "Failed to create FILE*"
msgstr ""
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:196
msgid "Failed to fork"
msgstr ""
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:210
msgid "Compress child"
msgstr ""
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:233
#, c-format
msgid "Internal error, failed to create %s"
msgstr ""
-#: ftparchive/multicompress.cc:282
+#: ftparchive/multicompress.cc:284
msgid "Failed to create subprocess IPC"
msgstr ""
-#: ftparchive/multicompress.cc:319
+#: ftparchive/multicompress.cc:321
msgid "Failed to exec compressor "
msgstr ""
-#: ftparchive/multicompress.cc:358
+#: ftparchive/multicompress.cc:360
msgid "decompressor"
msgstr ""
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:403
msgid "IO to subprocess/file failed"
msgstr ""
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:455
msgid "Failed to read while computing MD5"
msgstr ""
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:472
#, c-format
msgid "Problem unlinking %s"
msgstr ""
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr ""
@@ -550,133 +551,137 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
#, c-format
msgid "but %s is installed"
msgstr ""
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
#, c-format
msgid "but %s is to be installed"
msgstr ""
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
msgid "but it is not installable"
msgstr ""
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
msgid "but it is a virtual package"
msgstr ""
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
msgid "but it is not installed"
msgstr ""
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
msgid "but it is not going to be installed"
msgstr ""
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
msgid " or"
msgstr ""
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
msgid "The following NEW packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
msgid "The following packages will be REMOVED:"
msgstr ""
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
msgid "The following packages have been kept back:"
msgstr ""
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
msgid "The following packages will be upgraded:"
msgstr ""
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
msgid "The following held packages will be changed:"
msgstr ""
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:633
#, c-format
msgid "Note, selecting '%s' for task '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:639
#, c-format
msgid "Note, selecting '%s' for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:656
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:667
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:676
msgid " [Not candidate version]"
msgstr ""
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:678
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:681
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -684,177 +689,177 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:699
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:711
#, c-format
msgid "Package '%s' has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:722
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
msgstr ""
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:753
#, c-format
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:783
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:787
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:799
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:804
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2080 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:2103 cmdline/apt-mark.cc:61
#, c-format
msgid "%s set to manually installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:849
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:854
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:896
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:974
msgid "Correcting dependencies..."
msgstr ""
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:977
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Unable to correct dependencies"
msgstr ""
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:983
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:985
msgid " Done"
msgstr ""
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:989
msgid "You might want to run 'apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:992
msgid "Unmet dependencies. Try using -f."
msgstr ""
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1017
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1028
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1030
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1039 cmdline/apt-get.cc:1200
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1080
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1089
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1100
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1138
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1142
+#: cmdline/apt-get.cc:1145
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1147
+#: cmdline/apt-get.cc:1150
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1154
+#: cmdline/apt-get.cc:1157
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1159
+#: cmdline/apt-get.cc:1162
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2492
-#: cmdline/apt-get.cc:2495
+#: cmdline/apt-get.cc:1177 cmdline/apt-get.cc:1180 cmdline/apt-get.cc:2523
+#: cmdline/apt-get.cc:2526
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1190
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1206 cmdline/apt-get.cc:1226
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1208
msgid "Yes, do as I say!"
msgstr ""
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1210
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -862,46 +867,46 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1216 cmdline/apt-get.cc:1235
msgid "Abort."
msgstr ""
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1231
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2557 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1303 cmdline/apt-get.cc:2588 apt-pkg/algorithms.cc:1492
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1321
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2569
+#: cmdline/apt-get.cc:1322 cmdline/apt-get.cc:2600
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1328
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1332
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1337
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1338
msgid "Aborting install."
msgstr ""
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -911,35 +916,35 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1370
msgid "Note: This is done automatic and on purpose by dpkg."
msgstr ""
-#: cmdline/apt-get.cc:1497
+#: cmdline/apt-get.cc:1508
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1540
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1567
+#: cmdline/apt-get.cc:1578
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1594
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1645
+#: cmdline/apt-get.cc:1657
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1761
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -955,15 +960,15 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1743 cmdline/apt-get.cc:1913
+#: cmdline/apt-get.cc:1764 cmdline/apt-get.cc:1933
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1768
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1754
+#: cmdline/apt-get.cc:1775
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -972,7 +977,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: cmdline/apt-get.cc:1758
+#: cmdline/apt-get.cc:1779
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -980,25 +985,25 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: cmdline/apt-get.cc:1760
+#: cmdline/apt-get.cc:1781
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1779
+#: cmdline/apt-get.cc:1800
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1878
+#: cmdline/apt-get.cc:1899
msgid "You might want to run 'apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1882
+#: cmdline/apt-get.cc:1903
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1898
+#: cmdline/apt-get.cc:1918
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1006,201 +1011,222 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1916
+#: cmdline/apt-get.cc:1939
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1942
+#: cmdline/apt-get.cc:1965
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:2032
+#: cmdline/apt-get.cc:2055
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2056
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2098
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:2082 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2105 cmdline/apt-mark.cc:63
#, c-format
msgid "%s set to automatically installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2113 cmdline/apt-mark.cc:107
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:2106
+#: cmdline/apt-get.cc:2129
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:2109 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2132 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2137
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:2181 cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2204 cmdline/apt-get.cc:2212
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2213 cmdline/apt-get.cc:2246
+#: cmdline/apt-get.cc:2240 cmdline/apt-get.cc:2276
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:2297
+#: cmdline/apt-get.cc:2327
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2353
+#: cmdline/apt-get.cc:2385
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2394 cmdline/apt-get.cc:2690
+#: cmdline/apt-get.cc:2425 cmdline/apt-get.cc:2737
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2442
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2416
+#: cmdline/apt-get.cc:2447
#, c-format
msgid ""
"Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2469
+#: cmdline/apt-get.cc:2500
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2506
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2546
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2520
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2526
+#: cmdline/apt-get.cc:2557
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2564
+#: cmdline/apt-get.cc:2595
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2595
+#: cmdline/apt-get.cc:2626
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2607
+#: cmdline/apt-get.cc:2638
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2608
+#: cmdline/apt-get.cc:2639
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2661
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2645
+#: cmdline/apt-get.cc:2681
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2664
+#: cmdline/apt-get.cc:2700
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2695
+#: cmdline/apt-get.cc:2725
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+
+#: cmdline/apt-get.cc:2742
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2715
+#: cmdline/apt-get.cc:2762
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2892
+#, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+
+#: cmdline/apt-get.cc:2913
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2819
+#: cmdline/apt-get.cc:2936
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+
+#: cmdline/apt-get.cc:2975
#, c-format
msgid ""
-"%s dependency for %s cannot be satisfied because no available versions of "
-"package %s can satisfy version requirements"
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2855
+#: cmdline/apt-get.cc:2981
#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
msgstr ""
-#: cmdline/apt-get.cc:2882
+#: cmdline/apt-get.cc:3004
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2898
+#: cmdline/apt-get.cc:3020
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2903
+#: cmdline/apt-get.cc:3025
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2996 cmdline/apt-get.cc:3008
+#: cmdline/apt-get.cc:3118 cmdline/apt-get.cc:3130
#, c-format
msgid "Changelog for %s (%s)"
msgstr ""
-#: cmdline/apt-get.cc:3130
+#: cmdline/apt-get.cc:3252
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:3171
+#: cmdline/apt-get.cc:3293
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1246,7 +1272,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3333
+#: cmdline/apt-get.cc:3458
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1254,33 +1280,33 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
msgid "Hit "
msgstr ""
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
msgid "Get:"
msgstr ""
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
msgid "Ign "
msgstr ""
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
msgid "Err "
msgstr ""
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr ""
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
#, c-format
msgid " [Working]"
msgstr ""
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
#, c-format
msgid ""
"Media change: please insert the disc labeled\n"
@@ -1288,46 +1314,62 @@ msgid ""
"in the drive '%s' and press enter\n"
msgstr ""
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"apt.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:48
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr ""
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:54
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr ""
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:56
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr ""
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:171
#, c-format
msgid "%s was already set on hold.\n"
msgstr ""
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:173
#, c-format
msgid "%s was already not hold.\n"
msgstr ""
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:209
#, c-format
msgid "%s set on hold.\n"
msgstr ""
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:189 cmdline/apt-mark.cc:214
#, c-format
msgid "Canceled hold on %s.\n"
msgstr ""
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:222
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:270
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -1349,11 +1391,11 @@ msgid ""
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
msgstr ""
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -1401,196 +1443,196 @@ msgstr ""
msgid "Merging available information"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr ""
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
msgid "Corrupted archive"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr ""
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
msgid "Invalid archive signature"
msgstr ""
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
msgid "Error reading archive member header"
msgstr ""
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
#, c-format
msgid "Invalid archive member header %s"
msgstr ""
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
msgid "Invalid archive member header"
msgstr ""
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
msgid "Archive is too short"
msgstr ""
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
msgid "Failed to read the archive headers"
msgstr ""
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
msgid "DropNode called on still linked node"
msgstr ""
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
msgid "Failed to locate the hash element!"
msgstr ""
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
msgid "Failed to allocate diversion"
msgstr ""
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
msgid "Internal error in AddDiversion"
msgstr ""
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
msgstr ""
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
#, c-format
msgid "Double add of diversion %s -> %s"
msgstr ""
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
#, c-format
msgid "Duplicate conf file %s/%s"
msgstr ""
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr ""
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
#, c-format
msgid "Failed to close file %s"
msgstr ""
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr ""
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr ""
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr ""
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr ""
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr ""
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr ""
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr ""
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr ""
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr ""
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:338
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:344 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
#, c-format
msgid "Unable to read %s"
msgstr ""
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
#, c-format
msgid "Failed to remove %s"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
#, c-format
msgid "Unable to create %s"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
#, c-format
msgid "Failed to stat %sinfo"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1168
+#: apt-pkg/pkgcachegen.cc:1272 apt-pkg/pkgcachegen.cc:1278
+#: apt-pkg/pkgcachegen.cc:1434
msgid "Reading package lists"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
#, c-format
msgid "Failed to change to the admin dir %sinfo"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
msgid "Internal error getting a package name"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
#, c-format
msgid ""
"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1598,482 +1640,487 @@ msgid ""
"package!"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
#, c-format
msgid "Failed reading the list file %sinfo/%s"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
msgid "Internal error getting a node"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
#, c-format
msgid "Failed to open the diversions file %sdiversions"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
msgid "The diversion file is corrupted"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
#, c-format
msgid "Invalid line in the diversion file: %s"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
msgid "Internal error adding a diversion"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
msgid "The pkg cache must be initialized first"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
#, c-format
msgid "Bad ConfFile section in the status file. Offset %lu"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
#, c-format
msgid "Error parsing MD5. Offset %lu"
msgstr ""
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr ""
#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56
#, c-format
msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
#, c-format
msgid "Couldn't change to %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157
#, c-format
msgid "Internal error, could not locate member %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
msgid "Failed to locate a valid control file"
msgstr ""
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277
msgid "Unparsable control file"
msgstr ""
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
#, c-format
msgid "Couldn't open pipe for %s"
msgstr ""
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
#, c-format
msgid "Read error from %s process"
msgstr ""
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:530
+#: methods/rred.cc:539
msgid "Failed to stat"
msgstr ""
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:536
msgid "Failed to set modification time"
msgstr ""
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr ""
-#: methods/cdrom.cc:208
+#: methods/cdrom.cc:212
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
msgid "Wrong CD-ROM"
msgstr ""
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
msgid "Disk not found."
msgstr ""
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
msgid "File not found"
msgstr ""
-#: methods/file.cc:44
+#: methods/file.cc:47
msgid "Invalid URI, local URIS must not start with //"
msgstr ""
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
msgid "Logging in"
msgstr ""
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
msgid "Unable to determine the peer name"
msgstr ""
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
msgid "Unable to determine the local name"
msgstr ""
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
#, c-format
msgid "The server refused the connection and said: %s"
msgstr ""
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
#, c-format
msgid "USER failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
#, c-format
msgid "PASS failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
#, c-format
msgid "TYPE failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
msgid "Connection timeout"
msgstr ""
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:832 methods/rsh.cc:197
msgid "Read error"
msgstr ""
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
msgid "A response overflowed the buffer."
msgstr ""
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:874 methods/rsh.cc:239
msgid "Write error"
msgstr ""
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
msgid "Could not create a socket"
msgstr ""
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
msgid "Could not connect passive socket."
msgstr ""
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
msgid "getaddrinfo was unable to get a listening socket"
msgstr ""
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
msgid "Could not bind a socket"
msgstr ""
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
msgid "Could not listen on the socket"
msgstr ""
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
msgid "Could not determine the socket's name"
msgstr ""
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
msgid "Unable to send PORT command"
msgstr ""
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr ""
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
#, c-format
msgid "EPRT failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
msgid "Data socket connect timed out"
msgstr ""
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1031 methods/rsh.cc:309
msgid "Problem hashing file"
msgstr ""
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr ""
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
msgid "Data socket timed out"
msgstr ""
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr ""
#. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
msgid "Query"
msgstr ""
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
msgid "Unable to invoke "
msgstr ""
-#: methods/connect.cc:71
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr ""
-#: methods/connect.cc:82
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr ""
-#: methods/connect.cc:89
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:95
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
-#: methods/connect.cc:103
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:121
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr ""
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
#, c-format
msgid "Connecting to %s"
msgstr ""
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
-#: methods/connect.cc:193
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:196
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:243
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr ""
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
-#: methods/http.cc:385
+#: methods/http.cc:393
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:531
+#: methods/http.cc:539
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:539
+#: methods/http.cc:547
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:600
+#: methods/http.cc:608
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:615
+#: methods/http.cc:623
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:617
+#: methods/http.cc:625
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:641
+#: methods/http.cc:649
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:800
+#: methods/http.cc:808
msgid "Select failed"
msgstr ""
-#: methods/http.cc:805
+#: methods/http.cc:813
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:828
+#: methods/http.cc:836
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:859
+#: methods/http.cc:867
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:887
+#: methods/http.cc:895
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:901
+#: methods/http.cc:909
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:903
+#: methods/http.cc:911
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
+#: methods/http.cc:1016 apt-pkg/contrib/mmap.cc:293
msgid "Failed to truncate file"
msgstr ""
-#: methods/http.cc:1183
+#: methods/http.cc:1191
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1208 methods/http.cc:1263
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1347
+#: methods/http.cc:1355
msgid "Internal error"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:91
#, c-format
msgid "Couldn't duplicate file descriptor %i"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
+#: apt-pkg/contrib/mmap.cc:99
#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+msgid "Couldn't make mmap of %llu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:126
msgid "Unable to close mmap"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:154 apt-pkg/contrib/mmap.cc:182
msgid "Unable to synchronize mmap"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:260
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:312
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:411
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:414
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2102,93 +2149,93 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
#, c-format
msgid "Selection %s not found"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:452
+#: apt-pkg/contrib/configuration.cc:468
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:510
+#: apt-pkg/contrib/configuration.cc:526
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:678
+#: apt-pkg/contrib/configuration.cc:694
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:713
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:714
+#: apt-pkg/contrib/configuration.cc:730
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:761
+#: apt-pkg/contrib/configuration.cc:777
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:790
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:777
+#: apt-pkg/contrib/configuration.cc:793
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:827
+#: apt-pkg/contrib/configuration.cc:843
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
#, c-format
msgid "%c%s... Error!"
msgstr ""
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
#, c-format
msgid "%c%s... Done"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
#, c-format
msgid "Command line option %s is not understood"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
#, c-format
msgid "Command line option %s is not boolean"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
#, c-format
msgid "Option %s requires an argument."
msgstr ""
@@ -2198,602 +2245,573 @@ msgstr ""
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
#, c-format
msgid "Option '%s' is too long"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:300
+#: apt-pkg/contrib/cmndline.cc:298
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
#, c-format
msgid "Invalid operation %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
#, c-format
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
#, c-format
msgid "Unable to change to %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:169
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Could not open lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:192
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:196
#, c-format
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:336
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:363
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:381
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:390
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:691
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:703
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:705
#, c-format
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:709
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:711
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:776 apt-pkg/indexcopy.cc:676
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:793
#, c-format
msgid "Could not open file descriptor %d"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:841
+#: apt-pkg/contrib/fileutl.cc:853
#, c-format
-msgid "read, still have %lu to read but none left"
+msgid "read, still have %llu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:874
+#: apt-pkg/contrib/fileutl.cc:886
#, c-format
-msgid "write, still have %lu to write but couldn't"
+msgid "write, still have %llu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1023
#, c-format
msgid "Problem closing the gzip file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1026
#, c-format
msgid "Problem closing the file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1031
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1042
#, c-format
msgid "Problem unlinking the file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1055
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:167
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr ""
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr ""
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr ""
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr ""
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr ""
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr ""
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr ""
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr ""
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr ""
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr ""
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr ""
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr ""
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:159
msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:131
msgid "Candidate versions"
msgstr ""
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:160
msgid "Dependency generation"
msgstr ""
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:180 apt-pkg/depcache.cc:213 apt-pkg/depcache.cc:217
msgid "Reading state information"
msgstr ""
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:242
#, c-format
msgid "Failed to open StateFile %s"
msgstr ""
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:248
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr ""
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr ""
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:447
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
+msgid "Could not configure '%s'. "
msgstr ""
-#: apt-pkg/packagemanager.cc:501
+#: apt-pkg/packagemanager.cc:507
#, c-format
msgid ""
-"Could not perform immediate configuration on already unpacked '%s'. Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
#, c-format
msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
msgstr ""
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
#, c-format
msgid "List directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
#, c-format
msgid "Archives directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
#, c-format
msgid "Unable to lock directory %s"
msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
#, c-format
msgid "The method driver %s could not be found."
msgstr ""
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
#, c-format
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:151
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:167
msgid "Unable to determine a suitable packaging system type"
msgstr ""
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
#, c-format
msgid "Unable to stat %s."
msgstr ""
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
msgid "The list of sources could not be read."
msgstr ""
-#: apt-pkg/policy.cc:375
+#: apt-pkg/policy.cc:74
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:396
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:397
+#: apt-pkg/policy.cc:418
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:405
+#: apt-pkg/policy.cc:426
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:83
msgid "Cache has an incompatible versioning system"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:309
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:275
+#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:353
+#: apt-pkg/pkgcachegen.cc:357 apt-pkg/pkgcachegen.cc:374
+#: apt-pkg/pkgcachegen.cc:384 apt-pkg/pkgcachegen.cc:388
+#: apt-pkg/pkgcachegen.cc:392 apt-pkg/pkgcachegen.cc:413
+#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:463
+#: apt-pkg/pkgcachegen.cc:494 apt-pkg/pkgcachegen.cc:508
#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (%s%d)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:232
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:235
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:238
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:241
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:515
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1080
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1185
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1243 apt-pkg/pkgcachegen.cc:1250
+#: apt-pkg/pkgcachegen.cc:1376 apt-pkg/pkgcachegen.cc:1383
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
msgid "Hash Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1415
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1450
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1488
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1510
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2801,424 +2819,448 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
#, c-format
msgid "Unable to parse Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
#, c-format
msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr ""
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:528
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:537 apt-pkg/cdrom.cc:634
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:565
#, c-format
msgid "Stored label: %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:574 apt-pkg/cdrom.cc:850
msgid "Unmounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:594
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:612
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:617
msgid "Waiting for disc...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:626
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:645
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:687
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:698
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:725
#, c-format
msgid "Found label '%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:754
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:771
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:773
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:800
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:808
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:930
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:281 apt-pkg/indexcopy.cc:938
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:540
#, c-format
msgid "Skipping nonexistent file %s"
msgstr ""
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:546
#, c-format
msgid "Can't find authentication record for: %s"
msgstr ""
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:552
#, c-format
msgid "Hash mismatch for: %s"
msgstr ""
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:680
#, c-format
msgid "File %s doesn't start with a clearsigned message"
msgstr ""
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:708
+#: apt-pkg/indexcopy.cc:711
#, c-format
msgid "No keyring installed in %s."
msgstr ""
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:342
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:345
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:452
#, c-format
msgid "Couldn't find task '%s'"
msgstr ""
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:459
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:472
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:480 apt-pkg/cacheset.cc:488
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:496
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:504
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:512
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:70
#, c-format
msgid "Installing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:865
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:872
#, c-format
msgid "Removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:56
+#: apt-pkg/deb/dpkgpm.cc:73
#, c-format
msgid "Completely removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:671
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:668 apt-pkg/deb/dpkgpm.cc:688
+#: apt-pkg/deb/dpkgpm.cc:686 apt-pkg/deb/dpkgpm.cc:706
#, c-format
msgid "Could not open file '%s'"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:840
+#: apt-pkg/deb/dpkgpm.cc:858
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:859
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:846
+#: apt-pkg/deb/dpkgpm.cc:864
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:866
#, c-format
msgid "Installed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:853
+#: apt-pkg/deb/dpkgpm.cc:871
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:873
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:860
+#: apt-pkg/deb/dpkgpm.cc:878
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:879
#, c-format
msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1081
+#: apt-pkg/deb/dpkgpm.cc:1110
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1112
+#: apt-pkg/deb/dpkgpm.cc:1140
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1337
+#: apt-pkg/deb/dpkgpm.cc:1319
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1376
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1342
+#: apt-pkg/deb/dpkgpm.cc:1381
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1344
+#: apt-pkg/deb/dpkgpm.cc:1383
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1350
+#: apt-pkg/deb/dpkgpm.cc:1389
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1396
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1364 apt-pkg/deb/dpkgpm.cc:1370
+#: apt-pkg/deb/dpkgpm.cc:1403 apt-pkg/deb/dpkgpm.cc:1409
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1391
+#: apt-pkg/deb/dpkgpm.cc:1430
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
#, c-format
msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
msgstr ""
#. TRANSLATORS: the %s contains the recovery command, usually
#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
#, c-format
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
msgstr ""
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
msgstr ""
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
#, c-format
msgid "No mirror file '%s' found "
msgstr ""
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
#, c-format
msgid "Can not read mirror file '%s'"
msgstr ""
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
#, c-format
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:503
+#: methods/rred.cc:509
#, c-format
msgid ""
"Could not patch %s with mmap and with file operation usage - the patch seems "
"to be corrupt."
msgstr ""
-#: methods/rred.cc:508
+#: methods/rred.cc:514
#, c-format
msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
"to be corrupt."
msgstr ""
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
msgid "Connection closed prematurely"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 1e0f872c2..d70cf8da0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1080,7 +1080,7 @@ msgstr "La commande de mise à jour ne prend pas d'argument"
#: cmdline/apt-get.cc:1653
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-"Aucune suppression n'est sensée se produire : impossible de lancer "
+"Aucune suppression n'est censée se produire : impossible de lancer "
"« Autoremover »"
#: cmdline/apt-get.cc:1748
diff --git a/test/Makefile b/test/Makefile
new file mode 100644
index 000000000..da0a49b0c
--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,16 @@
+# -*- make -*-
+
+# This is the top level test makefile for APT, it recurses to each lower
+# level make file and runs it with the proper target
+ifndef NOISY
+.SILENT:
+endif
+
+.PHONY: headers library clean veryclean all binary program doc test
+all clean veryclean binary program dirs test:
+ $(MAKE) -C libapt $@
+ $(MAKE) -C interactive-helper $@
+
+# Some very common aliases
+.PHONY: maintainer-clean dist-clean distclean pristine sanity
+maintainer-clean dist-clean distclean pristine sanity: veryclean
diff --git a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages
deleted file mode 100644
index 3e7265438..000000000
--- a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages
+++ /dev/null
@@ -1,25 +0,0 @@
-Package: libglib2.0-data
-Priority: optional
-Section: misc
-Installed-Size: 2288
-Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
-Original-Maintainer: Loic Minier <lool@dooz.org>
-Architecture: all
-Source: glib2.0
-Version: 2.13.6-1ubuntu1
-Replaces: libglib1.3, libglib1.3-data
-Depends: libglib2.0-0 (>= 2.13.6-1ubuntu1)
-Conflicts: libglib1.3-data
-Filename: ./libglib2.0-data_2.13.6-1ubuntu1_all.deb
-Size: 958
-MD5sum: 803fc5e2e31a4345b3e9c771e1eae49f
-SHA1: 75b2c62b21bae60c58e694dd40ed6d4df946e304
-SHA256: 142d8466eac252f06bc957d76fe1bb87f86f2d3512b99c8d4b08c1ad79fbe59e
-Description: Common files for GLib library
- GLib is a library containing many useful C routines for things such
- as trees, hashes, lists, and strings. It is a useful general-purpose
- C library used by projects such as GTK+, GIMP, and GNOME.
- .
- This package is needed for the runtime libraries to display messages in
- languages other than English.
-
diff --git a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release
deleted file mode 100644
index 7ecd4cd19..000000000
--- a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release
+++ /dev/null
@@ -1,13 +0,0 @@
-Date: Fri, 27 Jul 2007 14:39:41 UTC
-MD5Sum:
- 4672dadea6a144839f823c9f3d5fd44b 934 Packages
- 82ebcf09a8d78a2b9cf7759349da4936 603 Packages.gz
- d41d8cd98f00b204e9800998ecf8427e 0 Release
-SHA1:
- fa0f294aa30789529371066b10e9497be1284d26 934 Packages
- f4032808663b2810d87b4a4dab6f5ae4a1e8fa8e 603 Packages.gz
- da39a3ee5e6b4b0d3255bfef95601890afd80709 0 Release
-SHA256:
- 92c9b605480dc74e6be79c0ddc24738bfcbd6dd3148af531acd68717de528049 934 Packages
- 659ccc0d07ff21f0247f9fa5abe149221c90d5e17da52c7afddb035b93c23d39 603 Packages.gz
- e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 Release
diff --git a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg
deleted file mode 100644
index 85c356e6f..000000000
--- a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQBGqgOwliSD4VZixzQRAs6jAJ9p7Aiob9gzkUNCtoW8UPrBo0E/YwCdEaz0
-CQJszU6fRYX5jGWXSWzfc5c=
-=ugH0
------END PGP SIGNATURE-----
diff --git a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages
deleted file mode 100644
index 3e7265438..000000000
--- a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages
+++ /dev/null
@@ -1,25 +0,0 @@
-Package: libglib2.0-data
-Priority: optional
-Section: misc
-Installed-Size: 2288
-Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
-Original-Maintainer: Loic Minier <lool@dooz.org>
-Architecture: all
-Source: glib2.0
-Version: 2.13.6-1ubuntu1
-Replaces: libglib1.3, libglib1.3-data
-Depends: libglib2.0-0 (>= 2.13.6-1ubuntu1)
-Conflicts: libglib1.3-data
-Filename: ./libglib2.0-data_2.13.6-1ubuntu1_all.deb
-Size: 958
-MD5sum: 803fc5e2e31a4345b3e9c771e1eae49f
-SHA1: 75b2c62b21bae60c58e694dd40ed6d4df946e304
-SHA256: 142d8466eac252f06bc957d76fe1bb87f86f2d3512b99c8d4b08c1ad79fbe59e
-Description: Common files for GLib library
- GLib is a library containing many useful C routines for things such
- as trees, hashes, lists, and strings. It is a useful general-purpose
- C library used by projects such as GTK+, GIMP, and GNOME.
- .
- This package is needed for the runtime libraries to display messages in
- languages other than English.
-
diff --git a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release
deleted file mode 100644
index 7ecd4cd19..000000000
--- a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release
+++ /dev/null
@@ -1,13 +0,0 @@
-Date: Fri, 27 Jul 2007 14:39:41 UTC
-MD5Sum:
- 4672dadea6a144839f823c9f3d5fd44b 934 Packages
- 82ebcf09a8d78a2b9cf7759349da4936 603 Packages.gz
- d41d8cd98f00b204e9800998ecf8427e 0 Release
-SHA1:
- fa0f294aa30789529371066b10e9497be1284d26 934 Packages
- f4032808663b2810d87b4a4dab6f5ae4a1e8fa8e 603 Packages.gz
- da39a3ee5e6b4b0d3255bfef95601890afd80709 0 Release
-SHA256:
- 92c9b605480dc74e6be79c0ddc24738bfcbd6dd3148af531acd68717de528049 934 Packages
- 659ccc0d07ff21f0247f9fa5abe149221c90d5e17da52c7afddb035b93c23d39 603 Packages.gz
- e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 Release
diff --git a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg
deleted file mode 100644
index 85c356e6f..000000000
--- a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQBGqgOwliSD4VZixzQRAs6jAJ9p7Aiob9gzkUNCtoW8UPrBo0E/YwCdEaz0
-CQJszU6fRYX5jGWXSWzfc5c=
-=ugH0
------END PGP SIGNATURE-----
diff --git a/test/authReliability/sources.list.failure b/test/authReliability/sources.list.failure
deleted file mode 100644
index 110f31884..000000000
--- a/test/authReliability/sources.list.failure
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/gpg-package-broken/ /
-
diff --git a/test/authReliability/sources.list.good b/test/authReliability/sources.list.good
deleted file mode 100644
index 2e9a4458a..000000000
--- a/test/authReliability/sources.list.good
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/gpg-package-ok/ /
-
diff --git a/test/fake-status b/test/fake-status
deleted file mode 100644
index 9e6366d5b..000000000
--- a/test/fake-status
+++ /dev/null
@@ -1,16 +0,0 @@
-Package: libglib2.0-0
-Status: install ok installed
-Priority: optional
-Section: libs
-Installed-Size: 1376
-Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
-Architecture: all
-Source: glib2.0
-Version: 2.13.7-1ubuntu1
-Description: The GLib library of C routines
- GLib is a library containing many useful C routines for things such
- as trees, hashes, lists, and strings. It is a useful general-purpose
- C library used by projects such as GTK+, GIMP, and GNOME.
- .
- This package contains the shared libraries.
-Original-Maintainer: Loic Minier <lool@dooz.org>
diff --git a/test/integration/framework b/test/integration/framework
index 8937c0a91..b55f793a4 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1,16 +1,19 @@
#!/bin/sh -- # no runable script, just for vi
# we all like colorful messages
-CERROR="" # red
-CWARNING="" # yellow
-CMSG="" # green
-CINFO="" # light blue
-CDEBUG="" # blue
-CNORMAL="" # default system console color
-CDONE="" # green
-CPASS="" # green
-CFAIL="" # red
-CCMD="" # pink
+if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null && \
+ expr match "$(readlink -f /proc/$$/fd/2)" '/dev/pts/[0-9]\+' > /dev/null; then
+ CERROR="" # red
+ CWARNING="" # yellow
+ CMSG="" # green
+ CINFO="" # light blue
+ CDEBUG="" # blue
+ CNORMAL="" # default system console color
+ CDONE="" # green
+ CPASS="" # green
+ CFAIL="" # red
+ CCMD="" # pink
+fi
msgdie() { echo "${CERROR}E: $1${CNORMAL}" >&2; exit 1; }
msgwarn() { echo "${CWARNING}W: $1${CNORMAL}" >&2; }
@@ -42,7 +45,11 @@ if [ $MSGLEVEL -le 2 ]; then
msgtest() { true; }
msgpass() { echo -n " ${CPASS}P${CNORMAL}" >&2; }
msgskip() { echo -n " ${CWARNING}S${CNORMAL}" >&2; }
- msgfail() { echo -n " ${CFAIL}FAIL${CNORMAL}" >&2; }
+ if [ -n "$CFAIL" ]; then
+ msgfail() { echo -n " ${CFAIL}FAIL${CNORMAL}" >&2; }
+ else
+ msgfail() { echo -n " ###FAILED###" >&2; }
+ fi
fi
if [ $MSGLEVEL -le 3 ]; then
msginfo() { true; }
@@ -142,6 +149,7 @@ setupenvironment() {
echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf
+ echo "DPKG::options:: \"--force-architecture\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it…
echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf
echo 'quiet::NoUpdate "true";' >> aptconfig.conf
export LC_ALL=C
@@ -149,13 +157,26 @@ setupenvironment() {
msgdone "info"
}
+getarchitecture() {
+ if [ "$1" = "native" -o -z "$1" ]; then
+ eval `aptconfig shell ARCH APT::Architecture`
+ if [ -n "$ARCH" ]; then
+ echo $ARCH
+ else
+ dpkg-architecture -qDEB_BUILD_ARCH
+ fi
+ else
+ echo $1
+ fi
+}
+
configarchitecture() {
local CONFFILE=rootdir/etc/apt/apt.conf.d/01multiarch.conf
rm -f $CONFFILE
- echo "APT::Architecture \"$1\";" > $CONFFILE
+ echo "APT::Architecture \"$(getarchitecture $1)\";" > $CONFFILE
shift
while [ -n "$1" ]; do
- echo "APT::Architectures:: \"$1\";" >> $CONFFILE
+ echo "APT::Architectures:: \"$(getarchitecture $1)\";" >> $CONFFILE
shift
done
}
@@ -268,7 +289,7 @@ Package: $NAME" > ${BUILDDIR}/debian/control
echo "pool/${SRC}" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist
done
- for arch in $(echo "$ARCH" | sed -e 's#,#\n#g'); do
+ for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
rm -rf ${BUILDDIR}/debian/tmp
mkdir -p ${BUILDDIR}/debian/tmp/DEBIAN ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME} ${BUILDDIR}/debian/tmp/usr/bin
cp ${BUILDDIR}/debian/copyright ${BUILDDIR}/debian/changelog ${BUILDDIR}/FEATURES ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME}
@@ -291,6 +312,7 @@ buildpackage() {
local BUILDDIR=$1
local RELEASE=$2
local SECTION=$3
+ local ARCH=$(getarchitecture $4)
msgninfo "Build package $(echo "$BUILDDIR" | grep -o '[^/]*$') for ${RELEASE} in ${SECTION}… "
cd $BUILDDIR
if [ "$ARCH" = "all" ]; then
@@ -401,7 +423,7 @@ insertpackage() {
local DEPENDENCIES="$5"
local PRIORITY="${6:-optional}"
local ARCHS=""
- for arch in $(echo "$ARCH" | sed -e 's#,#\n#g'); do
+ for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
if [ "$arch" = "all" ]; then
ARCHS="$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
else
@@ -458,7 +480,7 @@ insertinstalledpackage() {
local DEPENDENCIES="$4"
local PRIORITY="${5:-optional}"
local FILE="rootdir/var/lib/dpkg/status"
- for arch in $(echo "$ARCH" | sed -e 's#,#\n#g'); do
+ for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
echo "Package: $NAME
Status: install ok installed
Priority: $PRIORITY
@@ -506,6 +528,7 @@ buildaptarchivefromfiles() {
# can be overridden by testcases for their pleasure
getcodenamefromsuite() { echo -n "$1"; }
getreleaseversionfromsuite() { true; }
+getlabelfromsuite() { true; }
generatereleasefiles() {
# $1 is the Date header and $2 is the ValidUntil header to be set
@@ -519,13 +542,17 @@ generatereleasefiles() {
local SUITE="$(echo "$dir" | cut -d'/' -f 4)"
local CODENAME="$(getcodenamefromsuite $SUITE)"
local VERSION="$(getreleaseversionfromsuite $SUITE)"
+ local LABEL="$(getlabelfromsuite $SUITE)"
if [ -n "$VERSION" ]; then
- VERSION="-o APT::FTPArchive::Release::Version='${VERSION}'"
+ VERSION="-o APT::FTPArchive::Release::Version=${VERSION}"
+ fi
+ if [ -n "$LABEL" ]; then
+ LABEL="-o APT::FTPArchive::Release::Label=${LABEL}"
fi
aptftparchive -qq release $dir \
-o APT::FTPArchive::Release::Suite="${SUITE}" \
-o APT::FTPArchive::Release::Codename="${CODENAME}" \
- -o APT::FTPArchive::Release::Label="Testcases" \
+ ${LABEL} \
${VERSION} \
| sed -e '/0 Release$/ d' > $dir/Release # remove the self reference
if [ "$SUITE" = "experimental" -o "$SUITE" = "experimental2" ]; then
@@ -703,8 +730,7 @@ N: Can't select versions from package '$1' as it is purely virtual"
N: No packages found"
local COMPAREFILE=$(mktemp)
addtrap "rm $COMPAREFILE;"
- local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH_CPU)
- eval `apt-config shell ARCH APT::Architecture`
+ local ARCH="$(getarchitecture 'native')"
echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' > $COMPAREFILE
aptcache show -q=0 $PACKAGE 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
}
diff --git a/test/integration/makefile b/test/integration/makefile
new file mode 100644
index 000000000..fb12fe9a8
--- /dev/null
+++ b/test/integration/makefile
@@ -0,0 +1,10 @@
+# -*- make -*-
+BASE=../..
+SUBDIR=test/integration
+
+# Bring in the default rules
+include ../../buildlib/defaults.mak
+
+.PHONY: test
+test:
+ ./run-tests
diff --git a/test/integration/run-tests b/test/integration/run-tests
index edac07dbf..75f2ad662 100755
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -8,17 +8,30 @@ if [ "$1" = "-q" ]; then
elif [ "$1" = "-v" ]; then
export MSGLEVEL=4
fi
+
+if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then
+ CTEST='\033[1;32m'
+ CHIGH='\033[1;35m'
+ CRESET='\033[0m'
+elif [ -z "${MSGLEVEL}" ]; then
+ export MSGLEVEL=2
+fi
+
+if [ -z "$MSGLEVEL" ]; then
+ MSGLEVEL=5
+fi
+
for testcase in $(run-parts --list $DIR | grep '/test-'); do
- if [ "$1" = "-q" ]; then
- echo -n "\033[1;32mRun Testcase \033[1;35m$(basename ${testcase})\033[0m"
+ if [ "$MSGLEVEL" -le 2 ]; then
+ echo -n "${CTEST}Testcase ${CHIGH}$(basename ${testcase})${CRESET}: "
else
- echo "\033[1;32mRun Testcase \033[1;35m$(basename ${testcase})\033[0m"
+ echo "${CTEST}Run Testcase ${CHIGH}$(basename ${testcase})${CRESET}"
fi
if ! ${testcase}; then
FAIL=$((FAIL+1))
echo "$(basename $testcase) ... FAIL"
fi
- if [ "$1" = "-q" ]; then
+ if [ "$MSGLEVEL" -le 2 ]; then
echo
fi
done
diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download
index 7db93c32f..4edb7c173 100755
--- a/test/integration/test-apt-get-download
+++ b/test/integration/test-apt-get-download
@@ -13,13 +13,12 @@ buildsimplenativepackage 'apt' 'all' '2.0' 'unstable'
setupaptarchive
testdownload() {
- msgtest 'Test download of package file' $1
- if [ -z "$3" ]; then
- aptget download ${2}
- else
- aptget download ${2}/${3}
+ local APT="$2"
+ if [ -n "$3" ]; then
+ APT="${APT}/${3}"
fi
- test -f $1 && msgpass || msgfail
+ msgtest "Test download of package file $1 with" "$APT"
+ aptget -qq download ${APT} && test -f $1 && msgpass || msgfail
}
testdownload apt_1.0_all.deb apt stable
diff --git a/test/integration/test-bug-254770-segfault-if-cache-not-buildable b/test/integration/test-bug-254770-segfault-if-cache-not-buildable
index b9f45b131..8fa337ccc 100755
--- a/test/integration/test-bug-254770-segfault-if-cache-not-buildable
+++ b/test/integration/test-bug-254770-segfault-if-cache-not-buildable
@@ -12,7 +12,6 @@ trap "$CURRENTTRAP" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
chmod a-x rootdir/var/lib/dpkg
testsegfault() {
- rm -f rootdir/var/cache/apt/*.bin
msgtest "No segfault in" "$*"
local TEST="$($* 2>&1 | grep -v 'E:')"
if [ -z "$TEST" ]; then
diff --git a/test/integration/test-bug-407511-fail-invalid-default-release b/test/integration/test-bug-407511-fail-invalid-default-release
index d0a73af7d..7f23a1e82 100755
--- a/test/integration/test-bug-407511-fail-invalid-default-release
+++ b/test/integration/test-bug-407511-fail-invalid-default-release
@@ -23,18 +23,31 @@ getreleaseversionfromsuite() {
fi
}
+getlabelfromsuite() {
+ if [ "$SUITE" = 'unstable' ]; then
+ echo -n 'UnstableTestcases'
+ else
+ echo -n 'Testcases'
+ fi
+}
+
setupaptarchive
passdist() {
- msgtest "Test that target-release is accepted" $1
+ msgtest 'Test that target-release is accepted' $1
aptget dist-upgrade -t $1 -qq && msgpass || msgfail
+ msgtest 'Test that target-release pins with' $1
+ aptcache policy -t $1 | grep -q ' 990' && msgpass || msgfail
}
faildist() {
- msgtest "Test that target-release is refused" $1
+ msgtest 'Test that target-release is refused' $1
aptget dist-upgrade -t $1 -qq 2> /dev/null && msgfail || msgpass
}
+msgtest 'Test that no default-release is active in this test' 'setup'
+aptcache policy | grep -q ' 990' && msgfall || msgpass
+
passdist unstable
passdist sid
faildist sidd
@@ -45,3 +58,9 @@ passdist 42*
passdist 4*.0
faildist 21.0
faildist 21*
+# we accept, but don't validate the following
+passdist a=unstable
+passdist n=sid
+passdist v=42.0
+passdist c=main
+passdist l=UnstableTestcases
diff --git a/test/integration/test-bug-590041-prefer-non-virtual-packages b/test/integration/test-bug-590041-prefer-non-virtual-packages
index 3e2693f85..e0dd7737f 100755
--- a/test/integration/test-bug-590041-prefer-non-virtual-packages
+++ b/test/integration/test-bug-590041-prefer-non-virtual-packages
@@ -3,7 +3,7 @@ set -e
. $(readlink -f $(dirname $0))/framework
setupenvironment
-configarchitecture "i386" "armel"
+configarchitecture 'i386' 'armel'
pkglibc6="Package: libc6
Architecture: armel
diff --git a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order
index 0f6493948..645e86d7d 100755
--- a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order
+++ b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order
@@ -25,7 +25,6 @@ MD5sum: 8489687ce10e656babd467c9ee389349
Description-de: Verschiedene Dateien für das Basis-System von Debian"
predependsgawk() {
- rm rootdir/var/cache/apt/*.bin
cp $TESTDIR/$(echo "$(basename $0)" | sed 's/test-/status-/') rootdir/var/lib/dpkg/status
echo "$pkgbasefile
Pre-Depends: $1
@@ -57,7 +56,6 @@ predependsgawk "awk | aawk"
predependsgawk "awk"
predependsgawk2() {
- rm rootdir/var/cache/apt/*.bin
cp $TESTDIR/$(echo "$(basename $0)" | sed 's/test-/status-/') rootdir/var/lib/dpkg/status
echo "$pkgbasefile
Pre-Depends: $1
diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files
index 11dee0628..bb1ac0e54 100755
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -11,9 +11,9 @@ touch aptarchive/Packages
setupflataptarchive
testaptgetupdate() {
- rm -rf rootdir/var/lib/apt rootdir/var/cache/apt
+ rm -rf rootdir/var/lib/apt
aptget update 2>> testaptgetupdate.diff >> testaptgetupdate.diff || true
- sed -i -e '/^Fetched / d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
+ sed -i -e '/^Fetched / d' -e '/Ign / d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
GIVEN="$1"
shift
msgtest "Test for correctness of" "apt-get update with $*"
@@ -78,7 +78,6 @@ testoverfile() {
createemptyfile 'en'
testaptgetupdate "Get:1 file: InRelease []
-Ign file: Translation-en
Reading package lists..." "empty file en.$COMPRESS over file"
createemptyarchive 'en'
@@ -89,12 +88,10 @@ Reading package lists..." "empty archive en.$COMPRESS over file"
# FIXME: Why omits the file transport the Packages Get line?
#Get:3 file: Packages []
testaptgetupdate "Get:1 file: InRelease []
-Ign file: Translation-en
Reading package lists..." "empty archive Packages.$COMPRESS over file"
createemptyfile 'Packages'
testaptgetupdate "Get:1 file: InRelease []
-Ign file: Translation-en
Err file: Packages
Empty files can't be valid archives
W: Failed to fetch ${COMPRESSOR}:$(readlink -f aptarchive/Packages.$COMPRESS) Empty files can't be valid archives
@@ -109,7 +106,6 @@ testoverhttp() {
testaptgetupdate "Get:1 http://localhost InRelease []
Get:2 http://localhost Packages []
Get:3 http://localhost Translation-en
-Ign http://localhost Translation-en
Reading package lists..." "empty file en.$COMPRESS over http"
createemptyarchive 'en'
@@ -121,14 +117,12 @@ Reading package lists..." "empty archive en.$COMPRESS over http"
createemptyarchive 'Packages'
testaptgetupdate "Get:1 http://localhost InRelease []
Get:2 http://localhost Packages []
-Ign http://localhost Translation-en
Reading package lists..." "empty archive Packages.$COMPRESS over http"
createemptyfile 'Packages'
#FIXME: we should response with a good error message instead
testaptgetupdate "Get:1 http://localhost InRelease []
Get:2 http://localhost Packages
-Ign http://localhost Translation-en
Err http://localhost Packages
Empty files can't be valid archives
W: Failed to fetch ${COMPRESSOR}:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:8080_Packages) Empty files can't be valid archives
diff --git a/test/integration/test-bug-601016-description-translation b/test/integration/test-bug-601016-description-translation
index 3a2114914..03fddbfda 100755
--- a/test/integration/test-bug-601016-description-translation
+++ b/test/integration/test-bug-601016-description-translation
@@ -78,7 +78,7 @@ Description-${LOCALE}: Mächtige Oberfläche für dpkg
testrun() {
echo "Acquire::Languages { \"${LOCALE}\"; \"en\"; };" > rootdir/etc/apt/apt.conf.d/00languages
export LC_ALL=""
- rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt/
+ rm -rf rootdir/var/lib/apt/lists
setupaptarchive
testequal "$LOCALESTANZA" aptcache show apt -o Test=File-${LOCALE}
testequal "$LOCALESTANZA" aptcache show apt:i386 -o Test=File-${LOCALE}
diff --git a/test/integration/test-bug-612099-multiarch-conflicts b/test/integration/test-bug-612099-multiarch-conflicts
index b8cfe59e2..dd9efb785 100755
--- a/test/integration/test-bug-612099-multiarch-conflicts
+++ b/test/integration/test-bug-612099-multiarch-conflicts
@@ -4,9 +4,7 @@ set -e
TESTDIR=$(readlink -f $(dirname $0))
. $TESTDIR/framework
setupenvironment
-configarchitecture "i386" "amd64"
-
-buildsimplenativepackage 'peace-dpkg' 'all' '1.0' 'stable'
+configarchitecture 'i386' 'amd64'
buildsimplenativepackage 'libc6' 'i386' '1.0' 'stable'
buildsimplenativepackage 'libc6' 'amd64' '1.0' 'stable'
@@ -17,9 +15,6 @@ buildsimplenativepackage 'foobar' 'amd64' '1.0' 'stable' 'Depends: libc6'
setupaptarchive
-aptget install peace-dpkg:i386 -y -qq 2>&1 > /dev/null
-testdpkginstalled peace-dpkg
-
aptget install libc6:i386 -t stable -y -qq 2>&1 > /dev/null
testdpkginstalled libc6
testequal 'Reading package lists...
diff --git a/test/integration/test-bug-618288-multiarch-same-lockstep b/test/integration/test-bug-618288-multiarch-same-lockstep
index a05f03df4..432431212 100755
--- a/test/integration/test-bug-618288-multiarch-same-lockstep
+++ b/test/integration/test-bug-618288-multiarch-same-lockstep
@@ -17,7 +17,20 @@ buildsimplenativepackage 'apt2' 'amd64' '2' 'unstable' 'Depends: libsame (= 2)'
setupaptarchive
-testequal 'Reading package lists...
+# order in switch libsame:{amd64,i386} are unpacked is irrelevant, as both are installed - but we need to do it together
+testequalor2 'Reading package lists...
+Building dependency tree...
+The following packages will be upgraded:
+ apt:i386 apt2 libsame libsame:i386
+4 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Inst libsame:i386 [1] (2 unstable [i386]) [libsame:amd64 on libsame:i386] [libsame:i386 on libsame:amd64] [libsame:amd64 apt:i386 ]
+Inst libsame [1] (2 unstable [amd64]) [apt2:amd64 apt:i386 ]
+Conf libsame:i386 (2 unstable [i386]) [apt2:amd64 apt:i386 ]
+Conf libsame (2 unstable [amd64]) [apt2:amd64 apt:i386 ]
+Inst apt2 [1] (2 unstable [amd64]) [apt:i386 ]
+Conf apt2 (2 unstable [amd64]) [apt:i386 ]
+Inst apt:i386 [1] (2 unstable [i386])
+Conf apt:i386 (2 unstable [i386])' 'Reading package lists...
Building dependency tree...
The following packages will be upgraded:
apt:i386 apt2 libsame libsame:i386
diff --git a/test/integration/test-bug-624218-Translation-file-handling b/test/integration/test-bug-624218-Translation-file-handling
new file mode 100755
index 000000000..a1e708d2e
--- /dev/null
+++ b/test/integration/test-bug-624218-Translation-file-handling
@@ -0,0 +1,87 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'i386'
+
+buildsimplenativepackage 'coolstuff' 'all' '1.0' 'unstable'
+
+setupaptarchive
+
+changetowebserver
+
+rm -rf rootdir/var/lib/apt/lists
+
+msgtest 'No download of non-existent locals' 'with Index'
+LC_ALL="" aptget update -o Acquire::Languages=en | grep -q -e 'Translation-[^e][^n] ' && msgfail || msgpass
+rm -rf rootdir/var/lib/apt/lists
+
+msgtest 'Download of existent locals' 'with Index'
+LC_ALL="" aptget update | grep -q -e 'Translation-en ' && msgpass || msgfail
+rm -rf rootdir/var/lib/apt/lists
+
+msgtest 'Download of en in LC_ALL=C' 'with Index'
+LC_ALL=C aptget update | grep -q -e 'Translation-en ' && msgpass || msgfail
+rm -rf rootdir/var/lib/apt/lists
+
+msgtest 'Download of en as forced language' 'with Index'
+aptget update -o Acquire::Languages=en | grep -q -e 'Translation-en ' && msgpass || msgfail
+rm -rf rootdir/var/lib/apt/lists
+
+msgtest 'Download of nothing else in forced language' 'with Index'
+aptget update -o Acquire::Languages=en | grep -q -e 'Translation-[^e][^n] ' && msgfail || msgpass
+rm -rf rootdir/var/lib/apt/lists
+
+msgtest 'Download no Translation- if forced language is non-existent' 'with Index'
+aptget update -o Acquire::Languages=ast_DE | grep -q -e 'Translation-' && msgfail || msgpass
+rm -rf rootdir/var/lib/apt/lists
+
+msgtest 'Download of nothing if none is forced' 'with Index'
+aptget update -o Acquire::Languages=none | grep -q -e 'Translation' && msgfail || msgpass
+rm -rf rootdir/var/lib/apt/lists
+
+sed -i '/i18n\/Index$/ d' $(find aptarchive -name 'Release')
+signreleasefiles
+
+# we have to try as not every archive includes the i18n Index in the Release file - if it has one at all
+msgtest 'Download no Translation- if forced language is non-existent' 'with not-announced Index'
+aptget update -o Acquire::Languages=ast_DE | grep -q -e 'Translation-' && msgfail || msgpass
+rm -rf rootdir/var/lib/apt/lists
+
+find aptarchive -name 'Index' -delete
+
+msgtest 'Download of en as forced language' 'without Index'
+aptget update -o Acquire::Languages=en | grep -q -e 'Translation-en ' && msgpass || msgfail
+rm -rf rootdir/var/lib/apt/lists
+
+msgtest 'Download of nothing else in forced language' 'without Index'
+aptget update -o Acquire::Languages=en | grep -q -e 'Translation-[^e][^n] ' && msgfail || msgpass
+rm -rf rootdir/var/lib/apt/lists
+
+msgtest 'Download of ast_DE as forced language' 'without Index'
+aptget update -o Acquire::Languages=ast_DE | grep -q -e 'Translation-ast_DE$' && msgpass || msgfail
+rm -rf rootdir/var/lib/apt/lists
+
+msgtest 'Download of nothing else in forced language' 'without Index'
+aptget update -o Acquire::Languages=ast_DE | grep -q -e 'Translation-[^a][^s]' && msgfail || msgpass
+rm -rf rootdir/var/lib/apt/lists
+
+msgtest 'Download of nothing if none is forced' 'without Index'
+aptget update -o Acquire::Languages=none | grep -q -e 'Translation' && msgfail || msgpass
+rm -rf rootdir/var/lib/apt/lists
+
+mkdir -p rootdir/var/lib/apt/lists
+touch rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_i18n_Translation-ast_DE
+
+msgtest 'Download of builtin files' 'without Index'
+aptget update | grep -q -e 'Translation-ast_DE' && msgpass || msgfail
+rm -rf rootdir/var/lib/apt/lists
+
+mkdir -p rootdir/var/lib/apt/lists
+touch rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_i18n_Translation-ast_DE
+
+msgtest 'Download of nothing (even builtin) if none is forced' 'without Index'
+aptget update -o Acquire::Languages=none | grep -q -e 'Translation' && msgfail || msgpass
+rm -rf rootdir/var/lib/apt/lists
diff --git a/test/integration/test-bug-633350-do-not-kill-last-char-in-Release b/test/integration/test-bug-633350-do-not-kill-last-char-in-Release
index 3d3835507..2aae7cfcc 100755
--- a/test/integration/test-bug-633350-do-not-kill-last-char-in-Release
+++ b/test/integration/test-bug-633350-do-not-kill-last-char-in-Release
@@ -15,7 +15,7 @@ echo 'NotAutomatic: yes' >> aptarchive/dists/unstable/Release
signreleasefiles
find aptarchive/dists -name 'InRelease' -delete
-rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt
+rm -rf rootdir/var/lib/apt/lists
OUTPUT="$(aptget update 2>&1)"
msgtest 'Check that parsing happens without warnings' 'with missing newline'
diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes
index 99943574e..a5e885745 100755
--- a/test/integration/test-compressed-indexes
+++ b/test/integration/test-compressed-indexes
@@ -10,10 +10,10 @@ configarchitecture "i386"
buildsimplenativepackage "testpkg" "i386" "1.0"
setupaptarchive
-local GOODSHOW="$(aptcache show testpkg)
+GOODSHOW="$(aptcache show testpkg)
"
-local GOODPOLICY="$(aptcache policy testpkg)"
-local GOODSHOWSRC="$(aptcache showsrc testpkg)
+GOODPOLICY="$(aptcache policy testpkg)"
+GOODSHOWSRC="$(aptcache showsrc testpkg)
"
test $(echo "$GOODSHOW" | grep -e '^Package: testpkg' -e '^Version: 1.0' -e '^Architecture: i386' | wc -l) -eq 3 || msgdie 'show is broken'
@@ -51,17 +51,16 @@ testrun() {
aptget clean
msgtest "\tdeb file is gone"; ! test -f rootdir/var/cache/apt/archives/testpkg_1.0_i386.deb && msgpass || msgfail
fi
- rm rootdir/var/cache/apt/pkgcache.bin rootdir/var/cache/apt/srcpkgcache.bin
+ rm -f rootdir/var/cache/apt/pkgcache.bin rootdir/var/cache/apt/srcpkgcache.bin
testequal "$GOODSHOW" aptcache show testpkg
testequal "$GOODSHOW" aptcache show testpkg
- rm rootdir/var/cache/apt/pkgcache.bin rootdir/var/cache/apt/srcpkgcache.bin
+ rm -f rootdir/var/cache/apt/pkgcache.bin rootdir/var/cache/apt/srcpkgcache.bin
testequal "$GOODPOLICY" aptcache policy testpkg
testequal "$GOODPOLICY" aptcache policy testpkg
- rm rootdir/var/cache/apt/pkgcache.bin rootdir/var/cache/apt/srcpkgcache.bin
+ rm -f rootdir/var/cache/apt/pkgcache.bin rootdir/var/cache/apt/srcpkgcache.bin
testequal "$GOODSHOWSRC" aptcache showsrc testpkg
testequal "$GOODSHOWSRC" aptcache showsrc testpkg
- rm -f rootdir/var/cache/apt/pkgcache.bin rootdir/var/cache/apt/srcpkgcache.bin
- rm -rf rootdir/var/cache/apt/archives
+ aptget clean
msgtest "Check if the source is aptgetable"
aptget source testpkg -qq 2> /dev/null > /dev/null && msgpass || msgfail
msgtest "\tdsc file is present"; test -f testpkg_1.0.dsc && msgpass || msgfail
@@ -100,7 +99,7 @@ testrun "compressed"
rm rootdir/etc/apt/apt.conf.d/02compressindex
changetowebserver
aptget update -qq
-local GOODPOLICY="$(aptcache policy testpkg)"
+GOODPOLICY="$(aptcache policy testpkg)"
test $(echo "$GOODPOLICY" | grep -e '^testpkg:' -e '^ Candidate:' -e '^ Installed: (none)' -e '500 http://' | wc -l) -eq 4
testequal "$GOODPOLICY" aptcache policy testpkg
diff --git a/test/integration/test-conflicts-loop b/test/integration/test-conflicts-loop
new file mode 100755
index 000000000..7b5724d74
--- /dev/null
+++ b/test/integration/test-conflicts-loop
@@ -0,0 +1,35 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture "i386"
+
+insertinstalledpackage 'openjdk-6-jre' 'i386' '6b16-1.8-0ubuntu1'
+insertpackage 'unstable' 'openjdk-6-jre' 'i386' '6b20-1.9.8-0ubuntu1~10.04.1' 'Conflicts: openjdk-6-jre-headless (<< 6b17~pre3-1), openjdk-6-jre-lib (<< 6b17~pre3-1)'
+insertinstalledpackage 'openjdk-6-jre-lib' 'i386' '6b16-1.8-0ubuntu1'
+insertpackage 'unstable' 'openjdk-6-jre-lib' 'i386' '6b20-1.9.8-0ubuntu1~10.04.1' 'Conflicts: openjdk-6-jre (<< 6b17~pre3-1), openjdk-6-jre-headless (<< 6b17~pre3-1)'
+insertinstalledpackage 'openjdk-6-jre-headless' 'i386' '6b16-1.8-0ubuntu1'
+insertpackage 'unstable' 'openjdk-6-jre-headless' 'i386' '6b20-1.9.8-0ubuntu1~10.04.1' 'Conflicts: openjdk-6-jre (<< 6b17~pre3-1), openjdk-6-jre-lib (<< 6b17~pre3-1)'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be upgraded:
+ openjdk-6-jre openjdk-6-jre-headless openjdk-6-jre-lib
+3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+ openjdk-6-jre-lib conflicts with openjdk-6-jre
+ openjdk-6-jre conflicts with openjdk-6-jre-headless
+ openjdk-6-jre-headless conflicts with openjdk-6-jre
+Remv openjdk-6-jre [6b16-1.8-0ubuntu1]
+ openjdk-6-jre-headless conflicts with openjdk-6-jre-lib
+Remv openjdk-6-jre-lib [6b16-1.8-0ubuntu1]
+Inst openjdk-6-jre-headless [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+ openjdk-6-jre conflicts with openjdk-6-jre-lib
+Inst openjdk-6-jre [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+Inst openjdk-6-jre-lib [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+Conf openjdk-6-jre-lib (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+Conf openjdk-6-jre (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+Conf openjdk-6-jre-headless (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])' aptget dist-upgrade -s -o APT::Immediate-Configure-All=true
diff --git a/test/integration/test-disappearing-packages b/test/integration/test-disappearing-packages
index b5d565c2f..0e0e9618d 100755
--- a/test/integration/test-disappearing-packages
+++ b/test/integration/test-disappearing-packages
@@ -4,21 +4,21 @@ set -e
TESTDIR=$(readlink -f $(dirname $0))
. $TESTDIR/framework
setupenvironment
-configarchitecture "i386"
+configarchitecture 'native'
-buildsimplenativepackage "old-pkg" "i386" "1.0" "stable"
+buildsimplenativepackage "old-pkg" "native" "1.0" "stable"
buildsimplenativepackage "unrelated" "all" "0.5" "unstable"
-setupsimplenativepackage "new-pkg" "i386" "2.0" "unstable" "Provides: old-pkg
+setupsimplenativepackage "new-pkg" "native" "2.0" "unstable" "Provides: old-pkg
Replaces: old-pkg
Conflicts: old-pkg (<< 2.0)"
-local BUILDDIR="incoming/new-pkg-2.0"
+BUILDDIR="incoming/new-pkg-2.0"
echo "/usr/share/doc/new-pkg /usr/share/doc/old-pkg" > ${BUILDDIR}/debian/new-pkg.links
buildpackage "$BUILDDIR" "unstable" "main"
rm -rf "$BUILDDIR"
setupsimplenativepackage "old-pkg" "all" "2.0" "unstable" "Depends: new-pkg"
-local BUILDDIR="incoming/old-pkg-2.0"
+BUILDDIR="incoming/old-pkg-2.0"
echo "/usr/share/doc/new-pkg /usr/share/doc/old-pkg" > ${BUILDDIR}/debian/old-pkg.links
echo "
override_dh_link:
@@ -33,9 +33,9 @@ aptget install old-pkg=1.0 --trivial-only -qq 2>&1 > /dev/null
testmarkedauto # old-pkg is manual installed
-local CMD="aptget dist-upgrade -y -q=0"
+CMD="aptget dist-upgrade -y -q=0"
msgtest "Test for equality of" "$CMD"
-local COMPAREFILE=$(mktemp)
+COMPAREFILE=$(mktemp)
echo "The following package disappeared from your system as
all files have been overwritten by other packages:
old-pkg
@@ -43,12 +43,12 @@ Note: This is done automatic and on purpose by dpkg." > $COMPAREFILE
$CMD 2>&1 | tail -n 4 | diff $COMPAREFILE - && msgpass || msgfail
rm $COMPAREFILE
-sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d'
+sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -e "s#:$(getarchitecture 'native') #:native #"
testfileequal "rootdir/var/log/apt/history.log" "
-Install: old-pkg:i386 (1.0)
+Install: old-pkg:native (1.0)
-Install: new-pkg:i386 (2.0, automatic)
-Upgrade: old-pkg:i386 (1.0, 2.0)
+Install: new-pkg:native (2.0, automatic)
+Upgrade: old-pkg:native (1.0, 2.0)
Disappeared: old-pkg (1.0)"
testmarkedauto # new-pkg should have get the manual flag from old-pkg
diff --git a/test/integration/test-hashsum-verification b/test/integration/test-hashsum-verification
index 033096ee8..3ac9eccfb 100755
--- a/test/integration/test-hashsum-verification
+++ b/test/integration/test-hashsum-verification
@@ -19,8 +19,6 @@ prepare() {
for release in $(find rootdir/var/lib/apt/lists 2> /dev/null); do
touch -d 'now - 6 hours' $release
done
- rm -rf rootdir/var/cache/apt/archives
- rm -f rootdir/var/cache/apt/*.bin
cp $1 aptarchive/Packages
find aptarchive -name 'Release' -delete
cat aptarchive/Packages | gzip > aptarchive/Packages.gz
diff --git a/test/integration/test-package-reinstallation b/test/integration/test-package-reinstallation
new file mode 100755
index 000000000..b4f2061ec
--- /dev/null
+++ b/test/integration/test-package-reinstallation
@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture "i386"
+
+insertinstalledpackage 'libc-bin' 'i386' '2.13-8' 'Replaces: libc6'
+insertpackage 'unstable' 'libc-bin' 'i386' '2.13-8' 'Replaces: libc6'
+insertinstalledpackage 'libc6' 'i386' '2.13-8' 'Depends: libc-bin (= 2.13-8)'
+insertpackage 'unstable' 'libc6' 'i386' '2.13-8' 'Depends: libc-bin (= 2.13-8)'
+insertinstalledpackage 'apt' 'i386' '0.8.15' 'Depends: libc6'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+0 upgraded, 0 newly installed, 2 reinstalled, 0 to remove and 0 not upgraded.
+Inst libc-bin [2.13-8] (2.13-8 unstable [i386])
+Conf libc-bin (2.13-8 unstable [i386])
+Inst libc6 [2.13-8] (2.13-8 unstable [i386])
+Conf libc6 (2.13-8 unstable [i386])' aptget install --reinstall libc6 libc-bin -s
diff --git a/test/integration/test-policy-pinning b/test/integration/test-policy-pinning
index fa356ed54..9e1ea4ac5 100755
--- a/test/integration/test-policy-pinning
+++ b/test/integration/test-policy-pinning
@@ -25,31 +25,70 @@ testequalpolicy() {
Pinned packages:" aptcache policy $*
}
-aptget update -qq
+aptgetupdate() {
+ # just to be sure that no old files are used
+ rm -rf rootdir/var/lib/apt
+ if aptget update -qq 2>&1 | grep '^E: '; then
+ msgwarn 'apt-get update failed with an error'
+ fi
+}
+
+### not signed archive
+
+aptgetupdate
testequalpolicy 100 500
testequalpolicy 990 500 -t now
sed -i aptarchive/Release -e 1i"NotAutomatic: yes"
-rm rootdir/var/cache/apt/srcpkgcache.bin rootdir/var/cache/apt/pkgcache.bin
-aptget update -qq
+aptgetupdate
testequalpolicy 100 1 -o Test=NotAutomatic
testequalpolicy 990 1 -o Test=NotAutomatic -t now
sed -i aptarchive/Release -e 1i"ButAutomaticUpgrades: yes"
-rm rootdir/var/cache/apt/srcpkgcache.bin rootdir/var/cache/apt/pkgcache.bin
-aptget update -qq
+aptgetupdate
testequalpolicy 100 100 -o Test=ButAutomaticUpgrades
testequalpolicy 990 100 -o Test=ButAutomaticUpgrades -t now
sed -i aptarchive/Release -e 's#NotAutomatic: yes#NotAutomatic: no#' -e '/ButAutomaticUpgrades: / d'
-rm rootdir/var/cache/apt/srcpkgcache.bin rootdir/var/cache/apt/pkgcache.bin
-aptget update -qq
+aptgetupdate
testequalpolicy 100 500 -o Test=Automatic
testequalpolicy 990 500 -o Test=Automatic -t now
+sed -i aptarchive/Release -e '/NotAutomatic: / d' -e '/ButAutomaticUpgrades: / d'
+
+### signed but no key in trusted
+
+signreleasefiles 'Marvin Paranoid'
+aptgetupdate
+testequalpolicy 100 500
+testequalpolicy 990 500 -t now
+
+sed -i aptarchive/Release -e 1i"NotAutomatic: yes"
+signreleasefiles 'Marvin Paranoid'
+aptgetupdate
+
+testequalpolicy 100 1 -o Test=NotAutomatic
+testequalpolicy 990 1 -o Test=NotAutomatic -t now
+
+sed -i aptarchive/Release -e 1i"ButAutomaticUpgrades: yes"
+signreleasefiles 'Marvin Paranoid'
+aptgetupdate
+
+testequalpolicy 100 100 -o Test=ButAutomaticUpgrades
+testequalpolicy 990 100 -o Test=ButAutomaticUpgrades -t now
+
+sed -i aptarchive/Release -e 's#NotAutomatic: yes#NotAutomatic: no#' -e '/ButAutomaticUpgrades: / d'
+signreleasefiles 'Marvin Paranoid'
+aptgetupdate
+
+testequalpolicy 100 500 -o Test=Automatic
+testequalpolicy 990 500 -o Test=Automatic -t now
+
+### signed and valid key
+
buildsimplenativepackage "coolstuff" "all" "1.0" "stable"
buildsimplenativepackage "coolstuff" "all" "2.0~bpo1" "backports"
@@ -135,8 +174,7 @@ Pin-Priority: -1" > rootdir/etc/apt/preferences
rm rootdir/etc/apt/preferences
sed -i aptarchive/dists/backports/Release -e 1i"NotAutomatic: yes"
signreleasefiles
-rm rootdir/var/cache/apt/srcpkgcache.bin rootdir/var/cache/apt/pkgcache.bin
-aptget update -qq
+aptgetupdate
testequalpolicycoolstuff "" "1.0" 1 500 0 "" -o Test=NotAutomatic
testequalpolicycoolstuff "" "1.0" 1 990 0 "" -o Test=NotAutomatic -t stable
@@ -164,8 +202,7 @@ testequalpolicycoolstuff "" "1.0" 1 990 600 "2.0~bpo1" -o Test=NotAutomatic -t s
rm rootdir/etc/apt/preferences
sed -i aptarchive/dists/backports/Release -e 1i"ButAutomaticUpgrades: yes"
signreleasefiles
-rm rootdir/var/cache/apt/srcpkgcache.bin rootdir/var/cache/apt/pkgcache.bin
-aptget update -qq
+aptgetupdate
testequalpolicycoolstuff "" "1.0" 100 500 0 "" -o Test=ButAutomaticUpgrades
testequalpolicycoolstuff "" "1.0" 100 990 0 "" -o Test=ButAutomaticUpgrades -t stable
@@ -211,8 +248,7 @@ setupaptarchive
sed -i aptarchive/dists/backports/Release -e 1i"NotAutomatic: yes"
signreleasefiles
-rm rootdir/var/cache/apt/srcpkgcache.bin rootdir/var/cache/apt/pkgcache.bin
-aptget update -qq
+aptgetupdate
testequalpolicycoolstuff "2.0~bpo1" "2.0~bpo1" 1 500 0 "" "2.0~bpo2" -o Test=NotAutomatic
testequalpolicycoolstuff "2.0~bpo1" "2.0~bpo1" 1 990 0 "" "2.0~bpo2" -o Test=NotAutomatic -t stable
@@ -220,8 +256,7 @@ testequalpolicycoolstuff "2.0~bpo1" "2.0~bpo2" 990 500 0 "" "2.0~bpo2" -o Test=N
sed -i aptarchive/dists/backports/Release -e 1i"ButAutomaticUpgrades: yes"
signreleasefiles
-rm rootdir/var/cache/apt/srcpkgcache.bin rootdir/var/cache/apt/pkgcache.bin
-aptget update -qq
+aptgetupdate
testequalpolicycoolstuff "2.0~bpo1" "2.0~bpo2" 100 500 0 "" "2.0~bpo2" -o Test=ButAutomaticUpgrades
testequalpolicycoolstuff "2.0~bpo1" "2.0~bpo2" 100 990 0 "" "2.0~bpo2" -o Test=ButAutomaticUpgrades -t stable
diff --git a/test/integration/test-provides-gone-with-upgrade b/test/integration/test-provides-gone-with-upgrade
new file mode 100755
index 000000000..70384ce29
--- /dev/null
+++ b/test/integration/test-provides-gone-with-upgrade
@@ -0,0 +1,26 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture "i386"
+
+insertinstalledpackage 'apt' 'i386' '0.8.14' 'Provides: libapt-pkg4.10'
+insertpackage 'unstable' 'apt' 'i386' '0.8.15' 'Depends: libapt-pkg4.10'
+insertpackage 'unstable' 'libapt-pkg4.10' 'i386' '0.8.15' 'Breaks: apt (<< 0.8.15)
+Replaces: apt (<< 0.8.15)'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ libapt-pkg4.10
+The following packages will be upgraded:
+ apt
+1 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst apt [0.8.14] (0.8.15 unstable [i386]) []
+Inst libapt-pkg4.10 (0.8.15 unstable [i386])
+Conf libapt-pkg4.10 (0.8.15 unstable [i386])
+Conf apt (0.8.15 unstable [i386])' aptget dist-upgrade -s
diff --git a/test/integration/test-releasefile-valid-until b/test/integration/test-releasefile-valid-until
index c35fe97ff..680a370cb 100755
--- a/test/integration/test-releasefile-valid-until
+++ b/test/integration/test-releasefile-valid-until
@@ -8,6 +8,11 @@ configarchitecture 'i386'
insertpackage 'wheezy' 'apt' 'all' '0.8.15'
+getlabelfromsuite() {
+ echo -n 'Testcases'
+}
+
+
setupaptarchive
setupreleasefile() {
diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification
index 961c49895..8bf02a78f 100755
--- a/test/integration/test-releasefile-verification
+++ b/test/integration/test-releasefile-verification
@@ -19,8 +19,7 @@ prepare() {
for release in $(find rootdir/var/lib/apt/lists 2> /dev/null); do
touch -d 'now - 6 hours' $release
done
- rm -rf rootdir/var/cache/apt/archives
- rm -f rootdir/var/cache/apt/*.bin
+ aptget clean
cp $1 aptarchive/Packages
find aptarchive -name 'Release' -delete
cat aptarchive/Packages | gzip > aptarchive/Packages.gz
diff --git a/test/integration/test-ubuntu-bug-761175-remove-purge b/test/integration/test-ubuntu-bug-761175-remove-purge
index 93b67fc02..f55c6e909 100755
--- a/test/integration/test-ubuntu-bug-761175-remove-purge
+++ b/test/integration/test-ubuntu-bug-761175-remove-purge
@@ -4,14 +4,14 @@ set -e
TESTDIR=$(readlink -f $(dirname $0))
. $TESTDIR/framework
setupenvironment
-configarchitecture 'i386'
+configarchitecture 'native'
-setupsimplenativepackage 'compiz-core' 'i386' '1.0' 'unstable'
+setupsimplenativepackage 'compiz-core' 'native' '1.0' 'unstable'
BUILDDIR='incoming/compiz-core-1.0'
mkdir -p ${BUILDDIR}/debian/compiz-core/etc
echo 'foo=bar;' > ${BUILDDIR}/compiz.conf
echo 'compiz.conf /etc/compiz.conf' >> ${BUILDDIR}/debian/install
-buildpackage "$BUILDDIR" 'unstable' 'main'
+buildpackage "$BUILDDIR" 'unstable' 'main' 'native'
rm -rf "$BUILDDIR"
setupaptarchive
@@ -27,7 +27,7 @@ aptget remove compiz-core -y -qq 2>&1 >/dev/null && msgpass || msgfail
testdpkgnotinstalled compiz-core
msgtest 'Check that conffiles are still around for' 'compiz-core'
-dpkg -l compiz-core | grep '^rc' 2>&1 >/dev/null && msgpass || msgfail
+dpkg -l compiz-core | grep -q '^rc' && msgpass || msgfail
testequal 'Reading package lists...
Building dependency tree...
diff --git a/test/extract-control.cc b/test/interactive-helper/extract-control.cc
index 29dcbf371..a1b3600aa 100644
--- a/test/extract-control.cc
+++ b/test/interactive-helper/extract-control.cc
@@ -1,5 +1,6 @@
#include <apt-pkg/debfile.h>
#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
#include <iostream>
#include <unistd.h>
diff --git a/test/makefile b/test/interactive-helper/makefile
index 9fcd6a826..b96139fda 100644
--- a/test/makefile
+++ b/test/interactive-helper/makefile
@@ -1,9 +1,9 @@
# -*- make -*-
-BASE=..
-SUBDIR=test
+BASE=../..
+SUBDIR=test/interactive-helper
# Bring in the default rules
-include ../buildlib/defaults.mak
+include ../../buildlib/defaults.mak
# Program for testing methods
PROGRAM=mthdcat
@@ -11,13 +11,6 @@ SLIBS =
SOURCE = mthdcat.cc
include $(PROGRAM_H)
-# Scratch program to test incomplete code fragments in
-PROGRAM=scratch-test
-SLIBS = -lapt-inst -lapt-pkg
-LIB_MAKES = apt-pkg/makefile apt-inst/makefile
-SOURCE = scratch.cc
-include $(PROGRAM_H)
-
# Version compare tester
PROGRAM=testextract
SLIBS = -lapt-pkg -lapt-inst
@@ -37,12 +30,6 @@ SLIBS = -lapt-pkg -lapt-inst
SOURCE = extract-control.cc
include $(PROGRAM_H)
-# Program for testing hashes
-PROGRAM=hash
-SLIBS = -lapt-pkg
-SOURCE = hash.cc
-include $(PROGRAM_H)
-
# Program for testing udevcdrom
PROGRAM=test_udevcdrom
SLIBS = -lapt-pkg
diff --git a/test/mthdcat.cc b/test/interactive-helper/mthdcat.cc
index 25d09a3f5..25d09a3f5 100644
--- a/test/mthdcat.cc
+++ b/test/interactive-helper/mthdcat.cc
diff --git a/test/networkless-install-fixes/README b/test/interactive-helper/networkless-install-fixes/README
index e7ee2b03d..e7ee2b03d 100644
--- a/test/networkless-install-fixes/README
+++ b/test/interactive-helper/networkless-install-fixes/README
diff --git a/test/networkless-install-fixes/sources.test.list b/test/interactive-helper/networkless-install-fixes/sources.test.list
index 380e1804d..380e1804d 100644
--- a/test/networkless-install-fixes/sources.test.list
+++ b/test/interactive-helper/networkless-install-fixes/sources.test.list
diff --git a/test/networkless-install-fixes/test.sh b/test/interactive-helper/networkless-install-fixes/test.sh
index 809d467ba..809d467ba 100755
--- a/test/networkless-install-fixes/test.sh
+++ b/test/interactive-helper/networkless-install-fixes/test.sh
diff --git a/test/rpmver.cc b/test/interactive-helper/rpmver.cc
index 9fc807de8..9fc807de8 100644
--- a/test/rpmver.cc
+++ b/test/interactive-helper/rpmver.cc
diff --git a/test/test_udevcdrom.cc b/test/interactive-helper/test_udevcdrom.cc
index 577e2d013..88f5f0153 100644
--- a/test/test_udevcdrom.cc
+++ b/test/interactive-helper/test_udevcdrom.cc
@@ -2,16 +2,18 @@
#include <stdio.h>
#include <assert.h>
+#include <vector>
+#include <iostream>
+
int main()
{
- int i;
pkgUdevCdromDevices c;
assert(c.Dlopen());
- vector<CdromDevice> l;
+ std::vector<CdromDevice> l;
l = c.Scan();
assert(l.empty() == false);
- for (i=0;i<l.size();i++)
+ for (size_t i = 0; i < l.size(); ++i)
std::cerr << l[i].DeviceName << " "
<< l[i].Mounted << " "
<< l[i].MountPath << std::endl;
diff --git a/test/testdeb.cc b/test/interactive-helper/testdeb.cc
index d28f20114..d28f20114 100644
--- a/test/testdeb.cc
+++ b/test/interactive-helper/testdeb.cc
diff --git a/test/testextract.cc b/test/interactive-helper/testextract.cc
index b790df618..f7ddb72f0 100644
--- a/test/testextract.cc
+++ b/test/interactive-helper/testextract.cc
@@ -6,6 +6,8 @@
#include <apt-pkg/extract.h>
#include <apt-pkg/init.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/pkgsystem.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/test/libapt/assert.h b/test/libapt/assert.h
index fae9b6c64..a07be4b57 100644
--- a/test/libapt/assert.h
+++ b/test/libapt/assert.h
@@ -26,6 +26,18 @@ void assertEquals(int const &expect, unsigned int const &get, unsigned long cons
assertEquals<unsigned int const&, unsigned int const&>(expect, get, line);
}
+void assertEquals(unsigned long const &expect, int const &get, unsigned long const &line) {
+ if (get < 0)
+ OutputAssertEqual(expect, "==", get, line);
+ assertEquals<unsigned long const&, unsigned long const&>(expect, get, line);
+}
+
+void assertEquals(int const &expect, unsigned long const &get, unsigned long const &line) {
+ if (expect < 0)
+ OutputAssertEqual(expect, "==", get, line);
+ assertEquals<unsigned long const&, unsigned long const&>(expect, get, line);
+}
+
#define equalsOr2(x,y,z) assertEqualsOr2(y, z, x, __LINE__)
@@ -54,6 +66,21 @@ void assertEqualsOr2(int const &expect1, int const &expect2, unsigned int const
}
+#define equalsOr3(w,x,y,z) assertEqualsOr3(x, y, z, w, __LINE__)
+
+template < typename X, typename Y >
+void OutputAssertEqualOr3(X expect1, X expect2, X expect3, char const* compare, Y get, unsigned long const &line) {
+ std::cerr << "Test FAILED: »" << expect1 << "« or »" << expect2 << "« or »" << expect3 << "« " << compare << " »" << get << "« at line " << line << std::endl;
+}
+
+template < typename X, typename Y >
+void assertEqualsOr3(X expect1, X expect2, X expect3, Y get, unsigned long const &line) {
+ if (expect1 == get || expect2 == get || expect3 == get)
+ return;
+ OutputAssertEqualOr3(expect1, expect2, expect3, "==", get, line);
+}
+
+
// simple helper to quickly output a vectors
template < typename X >
void dumpVector(X vec) {
diff --git a/test/libapt/compareversion_test.cc b/test/libapt/compareversion_test.cc
index b6213e84c..fdb1d5674 100644
--- a/test/libapt/compareversion_test.cc
+++ b/test/libapt/compareversion_test.cc
@@ -63,6 +63,9 @@ void assertVersion(int const &CurLine, string const &A, string const &B, int con
bool RunTest(const char *File)
{
+ if (FileExists(File) == false)
+ return _error->Error("Versiontestfile %s doesn't exist!", File);
+
ifstream F(File,ios::in);
if (!F != 0)
return false;
@@ -112,8 +115,8 @@ bool RunTest(const char *File)
int main(int argc, char *argv[])
{
- if (argc <= 1)
- RunTest("../versions.lst");
+ if (argc != 2)
+ return 1;
else
RunTest(argv[1]);
diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc
index f6aa7a697..a1c801ea2 100644
--- a/test/libapt/getlanguages_test.cc
+++ b/test/libapt/getlanguages_test.cc
@@ -126,13 +126,19 @@ int main(int argc,char *argv[])
_config->Set("Dir::State::lists", argv[1]);
vec = APT::Configuration::getLanguages(true, false, env);
- equals(vec.size(), 6);
+ equals(vec.size(), 7);
equals(vec[0], "de_DE");
equals(vec[1], "de");
equals(vec[2], "en");
equals(vec[3], "none");
- equalsOr2(vec[4], "pt", "tr");
- equalsOr2(vec[5], "tr", "pt");
+ equalsOr3(vec[4], "pt", "tr", "ast_DE");
+ equalsOr3(vec[5], "tr", "pt", "ast_DE");
+ equalsOr3(vec[6], "tr", "pt", "ast_DE");
+
+ _config->Set("Acquire::Languages", "none");
+ vec = APT::Configuration::getLanguages(true, false, env);
+ equals(vec.size(), 0);
+ _config->Set("Acquire::Languages", "");
_config->Set("Dir::State::lists", "/non-existing-dir");
_config->Set("Acquire::Languages::1", "none");
diff --git a/test/libapt/getlistoffilesindir_test.cc b/test/libapt/getlistoffilesindir_test.cc
index 5ee014cca..b2c95e840 100644
--- a/test/libapt/getlistoffilesindir_test.cc
+++ b/test/libapt/getlistoffilesindir_test.cc
@@ -7,7 +7,7 @@
#include <stdio.h>
#include <iostream>
-#define P(x) string(argv[1]).append("/").append(x)
+#define P(x) std::string(argv[1]).append("/").append(x)
int main(int argc,char *argv[])
{
diff --git a/test/libapt/hashsums_test.cc b/test/libapt/hashsums_test.cc
index 2cb71cc38..396e4cf6b 100644
--- a/test/libapt/hashsums_test.cc
+++ b/test/libapt/hashsums_test.cc
@@ -146,7 +146,7 @@ int main(int argc, char** argv)
equals(sha2.VerifyFile(argv[1]), true);
}
{
- HashString sha2("SHA256:"+string(argv[4]));
+ HashString sha2("SHA256:" + std::string(argv[4]));
equals(sha2.VerifyFile(argv[1]), true);
}
diff --git a/test/libapt/makefile b/test/libapt/makefile
index a5f79da1a..d3dddaeed 100644
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -6,6 +6,10 @@ BASENAME=_libapt_test
# Bring in the default rules
include ../../buildlib/defaults.mak
+.PHONY: test
+test:
+ ./run-tests
+
# Program for testing getLanguageCode
PROGRAM = getLanguages${BASENAME}
SLIBS = -lapt-pkg
diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc
index 7b496878d..b5d92d9d2 100644
--- a/test/libapt/parsedepends_test.cc
+++ b/test/libapt/parsedepends_test.cc
@@ -4,8 +4,8 @@
#include "assert.h"
int main(int argc,char *argv[]) {
- string Package;
- string Version;
+ std::string Package;
+ std::string Version;
unsigned int Op = 5;
unsigned int Null = 0;
bool StripMultiArch = true;
diff --git a/test/libapt/run-tests b/test/libapt/run-tests
index 0eea6d4f8..ada2dc38b 100755
--- a/test/libapt/run-tests
+++ b/test/libapt/run-tests
@@ -3,19 +3,32 @@ set -e
DIR=$(readlink -f $(dirname $0))
echo "Compiling the tests …"
-test -d "$DIR/../../build/obj/test/libapt/" || mkdir -p "$DIR/../../build/obj/test/libapt/"
(cd $DIR && make)
echo "Running all testcases …"
LDPATH="$DIR/../../build/bin"
EXT="_libapt_test"
+
+# detect if output is on a terminal (colorful) or better not
+if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then
+ COLHIGH='\033[1;35m'
+ COLRESET='\033[0m'
+ TESTOKAY='\033[1;32mOKAY\033[0m'
+ TESTFAIL='\033[1;31mFAILED\033[0m'
+else
+ COLHIGH=''
+ COLRESET=''
+ TESTOKAY='OK'
+ TESTFAIL='###FAILED###'
+fi
+
for testapp in $(ls ${LDPATH}/*$EXT)
do
name=$(basename ${testapp})
+ NAME="${COLHIGH}${name}${COLRESET}"
tmppath=""
if [ $name = "GetListOfFilesInDir${EXT}" ]; then
# TODO: very-low: move env creation to the actual test-app
- echo "Prepare Testarea for \033[1;35m$name\033[0m ..."
tmppath=$(mktemp -d)
touch "${tmppath}/anormalfile" \
"${tmppath}/01yet-anothernormalfile" \
@@ -47,12 +60,12 @@ do
ln -s "${tmppath}/anormalfile" "${tmppath}/linkedfile.list"
ln -s "${tmppath}/non-existing-file" "${tmppath}/brokenlink.list"
elif [ $name = "getLanguages${EXT}" ]; then
- echo "Prepare Testarea for \033[1;35m$name\033[0m ..."
tmppath=$(mktemp -d)
touch "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-tr" \
"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-pt" \
"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \
- "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak"
+ "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak" \
+ "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-ast_DE"
elif [ $name = "HashSums${EXT}" ]; then
TMP="$(mktemp)"
dmesg > $TMP
@@ -60,14 +73,14 @@ do
LD_LIBRARY_PATH=${LDPATH} ${testapp} $TMP $(md5sum $TMP | cut -d' ' -f 1) $(sha1sum $TMP | cut -d' ' -f 1) $(sha256sum $TMP | cut -d' ' -f 1) $(sha512sum $TMP | cut -d' ' -f 1) && echo "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m"
rm $TMP
continue
+ elif [ $name = "CompareVersion${EXT}" ]; then
+ tmppath="${DIR}/versions.lst"
fi
- echo -n "Testing with \033[1;35m${name}\033[0m ... "
- LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} && echo "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m"
+ echo -n "Testing with ${NAME} "
+ LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} && echo "$TESTOKAY" || echo "$TESTFAIL"
if [ -n "$tmppath" -a -d "$tmppath" ]; then
- echo "Cleanup Testarea after \033[1;35m$name\033[0m ..."
rm -rf "$tmppath"
fi
-
done
diff --git a/test/libapt/strutil_test.cc b/test/libapt/strutil_test.cc
index af6eb2cc6..bfe0d7222 100644
--- a/test/libapt/strutil_test.cc
+++ b/test/libapt/strutil_test.cc
@@ -4,7 +4,7 @@
int main(int argc,char *argv[])
{
- string input, output, expected;
+ std::string input, output, expected;
// no input
input = "foobar";
diff --git a/test/versions.lst b/test/libapt/versions.lst
index 8dd8ebdc9..8dd8ebdc9 100644
--- a/test/versions.lst
+++ b/test/libapt/versions.lst
diff --git a/test/local-repo/Packages b/test/local-repo/Packages
deleted file mode 100644
index fe62fc038..000000000
--- a/test/local-repo/Packages
+++ /dev/null
@@ -1,11 +0,0 @@
-Package: gdebi-test4
-Architecture: all
-Version: 1.0
-Conflicts: apt (<= 0.1)
-Filename: ./gdebi-test4.deb
-Size: 2306
-MD5sum: 0952a2b4a566215e0794c7603f3fcfcc
-SHA1: 318688ea2d53352a1bdb669ebd2cd4847f6c4e7c
-SHA256: 35f600b57253cef807a1da7c5deb06e7821de9223842a310a77b4da87cf51e2c
-Description: testpackage for gdebi - Conflicts: apt (<= 0.1)
-
diff --git a/test/local-repo/Packages.gz b/test/local-repo/Packages.gz
deleted file mode 100644
index b5d528435..000000000
--- a/test/local-repo/Packages.gz
+++ /dev/null
Binary files differ
diff --git a/test/local-repo/Packages.gz.save b/test/local-repo/Packages.gz.save
deleted file mode 100644
index c73f56395..000000000
--- a/test/local-repo/Packages.gz.save
+++ /dev/null
Binary files differ
diff --git a/test/local-repo/Release b/test/local-repo/Release
deleted file mode 100644
index 7f206ef25..000000000
--- a/test/local-repo/Release
+++ /dev/null
@@ -1,13 +0,0 @@
-Date: Thu, 09 Aug 2007 10:13:06 UTC
-MD5Sum:
- 29f79161fafe1f0c393e7fc6ddcb99b5 338 Packages
- 2f885b2ebdb77d3354ba63d8b5aad614 269 Packages.gz
- d41d8cd98f00b204e9800998ecf8427e 0 Release
-SHA1:
- d8860d409a8b0db443fbf254e2d6afbfc9bc04a8 338 Packages
- 8b668a7b730ceb4d702737a13a723959c20b67df 269 Packages.gz
- da39a3ee5e6b4b0d3255bfef95601890afd80709 0 Release
-SHA256:
- 39aa9fc59d868a71030d24aeaa4b574d7a11a10ea79491a0881f8d755b36a06d 338 Packages
- 62898623498ebf8304647db1ba2d33e4d8ec0e3e45250c2b66907c812b099297 269 Packages.gz
- e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 Release
diff --git a/test/local-repo/Release.gpg b/test/local-repo/Release.gpg
deleted file mode 100644
index e1c309566..000000000
--- a/test/local-repo/Release.gpg
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQBGuui6liSD4VZixzQRApSlAJ9D6G1QXvtXH1jH1I4SStsb1VsImQCbBPfp
-+1p0bDANcBVY+GckjJvFRkY=
-=a0AR
------END PGP SIGNATURE-----
diff --git a/test/local-repo/gdebi-test4.deb b/test/local-repo/gdebi-test4.deb
deleted file mode 100644
index 9eb92d1b4..000000000
--- a/test/local-repo/gdebi-test4.deb
+++ /dev/null
Binary files differ
diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py
deleted file mode 100755
index e79c8e800..000000000
--- a/test/pre-upload-check.py
+++ /dev/null
@@ -1,266 +0,0 @@
-#!/usr/bin/python
-
-import sys
-import os
-import glob
-import os.path
-import shutil
-import time
-from subprocess import call, PIPE
-
-import unittest
-
-stdout = os.open("/dev/null",0) #sys.stdout
-stderr = os.open("/dev/null",0) # sys.stderr
-
-apt_args = []
-#apt_args = ["-o","Debug::pkgAcquire::Auth=true"]
-
-class testAptAuthenticationReliability(unittest.TestCase):
- """
- test if the spec https://wiki.ubuntu.com/AptAuthenticationReliability
- is properly implemented
- """
- #apt = "../bin/apt-get"
- apt = "apt-get"
-
- def setUp(self):
- if os.path.exists("/tmp/autFailure"):
- os.unlink("/tmp/authFailure");
- if os.path.exists("/tmp/autFailure2"):
- os.unlink("/tmp/authFailure2");
- def testRepositorySigFailure(self):
- """
- test if a repository that used to be authenticated and fails on
- apt-get update refuses to update and uses the old state
- """
- # copy valid signatures into lists (those are ok, even
- # if the name is "-broken-" ...
- for f in glob.glob("./authReliability/lists/*"):
- shutil.copy(f,"/var/lib/apt/lists")
- # ensure we do *not* get a I-M-S hit
- os.utime("/var/lib/apt/lists/%s" % os.path.basename(f), (0,0))
- res = call([self.apt,
- "update",
- "-o","Dir::Etc::sourcelist=./authReliability/sources.list.failure",
- "-o",'APT::Update::Auth-Failure::=touch /tmp/authFailure',
- ] + apt_args,
- stdout=stdout, stderr=stderr)
- self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg"),
- "The gpg file disappeared, this should not happen")
- self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages"),
- "The Packages file disappeared, this should not happen")
- self.assert_(os.path.exists("/tmp/authFailure"),
- "The APT::Update::Auth-Failure script did not run (1)")
- # the same with i-m-s hit this time
- for f in glob.glob("./authReliability/lists/*"):
- shutil.copy(f,"/var/lib/apt/lists")
- os.utime("/var/lib/apt/lists/%s" % os.path.basename(f), (time.time(),time.time()))
- res = call([self.apt,
- "update",
- "-o","Dir::Etc::sourcelist=./authReliability/sources.list.failure",
- "-o",'APT::Update::Auth-Failure::=touch /tmp/authFailure2',
- ] + apt_args,
- stdout=stdout, stderr=stderr)
- self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg"),
- "The gpg file disappeared, this should not happen")
- self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages"),
- "The Packages file disappeared, this should not happen")
- self.assert_(os.path.exists("/tmp/authFailure2"),
- "The APT::Update::Auth-Failure script did not run (2)")
- def testRepositorySigGood(self):
- """
- test that a regular repository with good data stays good
- """
- res = call([self.apt,
- "update",
- "-o","Dir::Etc::sourcelist=./authReliability/sources.list.good"
- ] + apt_args,
- stdout=stdout, stderr=stderr)
- self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg"),
- "The gpg file disappeared after a regular download, this should not happen")
- self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages"),
- "The Packages file disappeared, this should not happen")
- # test good is still good after non I-M-S hit and a previous files in lists/
- for f in glob.glob("./authReliability/lists/*"):
- shutil.copy(f,"/var/lib/apt/lists")
- # ensure we do *not* get a I-M-S hit
- os.utime("/var/lib/apt/lists/%s" % os.path.basename(f), (0,0))
- res = call([self.apt,
- "update",
- "-o","Dir::Etc::sourcelist=./authReliability/sources.list.good"
- ] + apt_args,
- stdout=stdout, stderr=stderr)
- self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg"),
- "The gpg file disappeared after a I-M-S hit, this should not happen")
- self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages"),
- "The Packages file disappeared, this should not happen")
- # test good is still good after I-M-S hit
- for f in glob.glob("./authReliability/lists/*"):
- shutil.copy(f,"/var/lib/apt/lists")
- # ensure we do get a I-M-S hit
- os.utime("/var/lib/apt/lists/%s" % os.path.basename(f), (time.time(),time.time()))
- res = call([self.apt,
- "update",
- "-o","Dir::Etc::sourcelist=./authReliability/sources.list.good"
- ] + apt_args,
- stdout=stdout, stderr=stderr)
- self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg"),
- "The gpg file disappeared, this should not happen")
- self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages"),
- "The Packages file disappeared, this should not happen")
-
-
-class testAuthentication(unittest.TestCase):
- """
- test if the authentication is working, the repository
- of the test-data can be found here:
- bzr branch http://people.ubuntu.com/~mvo/bzr/apt/apt-auth-test-suit/
- """
-
- # some class wide data
- apt = "apt-get"
- pkg = "libglib2.0-data"
- pkgver = "2.13.6-1ubuntu1"
- pkgpath = "/var/cache/apt/archives/libglib2.0-data_2.13.6-1ubuntu1_all.deb"
-
- def setUp(self):
- for f in glob.glob("testkeys/*,key"):
- call(["apt-key", "add", f], stdout=stdout, stderr=stderr)
-
- def _cleanup(self):
- " make sure we get new lists and no i-m-s "
- call(["rm","-f", "/var/lib/apt/lists/*"])
- if os.path.exists(self.pkgpath):
- os.unlink(self.pkgpath)
-
- def _expectedRes(self, resultstr):
- if resultstr == 'ok':
- return 0
- elif resultstr == 'broken':
- return 100
-
-
- def testPackages(self):
- for f in glob.glob("testsources.list/sources.list*package*"):
- self._cleanup()
- (prefix, testtype, result) = f.split("-")
- expected_res = self._expectedRes(result)
- # update first
- call([self.apt,"update",
- "-o","Dir::Etc::sourcelist=./%s" % f]+apt_args,
- stdout=stdout, stderr=stderr)
- # then get the pkg
- cmd = ["install", "-y", "-d", "--reinstall",
- "%s=%s" % (self.pkg, self.pkgver),
- "-o","Dir::state::Status=./fake-status"]
- res = call([self.apt, "-o","Dir::Etc::sourcelist=./%s" % f]+cmd+apt_args,
- stdout=stdout, stderr=stderr)
- self.assert_(res == expected_res,
- "test '%s' failed (got %s expected %s" % (f,res,expected_res))
-
-
- def testGPG(self):
- for f in glob.glob("testsources.list/sources.list*gpg*"):
- self._cleanup()
- (prefix, testtype, result) = f.split("-")
- expected_res = self._expectedRes(result)
- # update first
- call([self.apt,"update",
- "-o","Dir::Etc::sourcelist=./%s" % f]+apt_args,
- stdout=stdout, stderr=stderr)
- cmd = ["install", "-y", "-d", "--reinstall",
- "%s=%s" % (self.pkg, self.pkgver),
- "-o","Dir::state::Status=./fake-status"]
- res = call([self.apt, "-o","Dir::Etc::sourcelist=./%s" % f]+
- cmd+apt_args,
- stdout=stdout, stderr=stderr)
- self.assert_(res == expected_res,
- "test '%s' failed (got %s expected %s" % (f,res,expected_res))
-
- def testRelease(self):
- for f in glob.glob("testsources.list/sources.list*release*"):
- self._cleanup()
- (prefix, testtype, result) = f.split("-")
- expected_res = self._expectedRes(result)
- cmd = ["update"]
- res = call([self.apt,"-o","Dir::Etc::sourcelist=./%s" % f]+cmd+apt_args,
- stdout=stdout, stderr=stderr)
- self.assert_(res == expected_res,
- "test '%s' failed (got %s expected %s" % (f,res,expected_res))
- if expected_res == 0:
- self.assert_(len(glob.glob("/var/lib/apt/lists/partial/*")) == 0,
- "partial/ dir has leftover files: %s" % glob.glob("/var/lib/apt/lists/partial/*"))
-
- def testValid(self):
- for f in glob.glob("testsources.list/sources.list*validuntil*"):
- self._cleanup()
- (prefix, testtype, result) = f.split("-")
- expected_res = self._expectedRes(result)
- cmd = ["update"]
- res = call([self.apt,"-o","Dir::Etc::sourcelist=./%s" % f]+cmd+apt_args,
- stdout=stdout, stderr=stderr)
- self.assert_(res == expected_res,
- "test '%s' failed (got %s expected %s" % (f,res,expected_res))
- if expected_res == 0:
- self.assert_(len(glob.glob("/var/lib/apt/lists/partial/*")) == 0,
- "partial/ dir has leftover files: %s" % glob.glob("/var/lib/apt/lists/partial/*"))
-
-
-class testLocalRepositories(unittest.TestCase):
- " test local repository regressions "
-
- repo_dir = "local-repo"
- apt = "apt-get"
- pkg = "gdebi-test4"
-
- def setUp(self):
- self.repo = os.path.abspath(os.path.join(os.getcwd(), self.repo_dir))
- self.sources = os.path.join(self.repo, "sources.list")
- s = open(self.sources,"w")
- s.write("deb file://%s/ /\n" % self.repo)
- s.close()
-
- def testLocalRepoAuth(self):
- # two times to get at least one i-m-s hit
- for i in range(2):
- self.assert_(os.path.exists(self.sources))
- cmd = [self.apt,"update","-o", "Dir::Etc::sourcelist=%s" % self.sources]+apt_args
- res = call(cmd, stdout=stdout, stderr=stderr)
- self.assertEqual(res, 0, "local repo test failed")
- self.assert_(os.path.exists(os.path.join(self.repo,"Packages.gz")),
- "Packages.gz vanished from local repo")
-
- def testInstallFromLocalRepo(self):
- apt = [self.apt,"-o", "Dir::Etc::sourcelist=%s"% self.sources]+apt_args
- cmd = apt+["update"]
- res = call(cmd, stdout=stdout, stderr=stderr)
- self.assertEqual(res, 0)
- res = call(apt+["-y","install","--reinstall",self.pkg],
- stdout=stdout, stderr=stderr)
- self.assert_(res == 0,
- "installing %s failed (got %s)" % (self.pkg, res))
- res = call(apt+["-y","remove",self.pkg],
- stdout=stdout, stderr=stderr)
- self.assert_(res == 0,
- "removing %s failed (got %s)" % (self.pkg, res))
-
- def testPythonAptInLocalRepo(self):
- import apt, apt_pkg
- apt_pkg.Config.Set("Dir::Etc::sourcelist",self.sources)
- cache = apt.Cache()
- cache.update()
- pkg = cache["apt"]
- self.assert_(pkg.name == 'apt')
-
-
-
-if __name__ == "__main__":
- print "Runing simple testsuit on current apt-get and libapt"
- if len(sys.argv) > 1 and sys.argv[1] == "-v":
- stdout = sys.stdout
- stderr = sys.stderr
-
- # run only one for now
- #unittest.main(defaultTest="testAptAuthenticationReliability")
- unittest.main()
diff --git a/test/scratch.cc b/test/scratch.cc
deleted file mode 100644
index d638c7097..000000000
--- a/test/scratch.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-#include <apt-pkg/dpkgdb.h>
-#include <apt-pkg/debfile.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/extract.h>
-#include <apt-pkg/init.h>
-#include <apt-pkg/fileutl.h>
-
-using namespace std;
-
-int main(int argc,char *argv[])
-{
- pkgInitConfig(*_config);
- pkgInitSystem(*_config,_system);
-
-// cout << flNoLink(argv[1]) << endl;
-
-// #if 0
-/* DynamicMMap *FileMap = new DynamicMMap(MMap::Public);
- pkgFLCache *FList = new pkgFLCache(*FileMap);
-
- char *Name = "/tmp/test";
- pkgFLCache::PkgIterator Pkg(*FList,0);
- pkgFLCache::NodeIterator Node = FList->GetNode(Name,Name+strlen(Name),Pkg.Offset(),true,false);
- cout << (pkgFLCache::Node *)Node << endl;
- Node = FList->GetNode(Name,Name+strlen(Name),Pkg.Offset(),true,false);
- cout << (pkgFLCache::Node *)Node << endl;
-*/
-// #if 0
- _config->Set("Dir::State::status","/tmp/testing/status");
-
- debDpkgDB Db;
-
- {
- OpTextProgress Prog;
-
- if (Db.ReadyPkgCache(Prog) == false)
- cerr << "Error!" << endl;
- Prog.Done();
-
- if (Db.ReadyFileList(Prog) == false)
- cerr << "Error!" << endl;
- }
-
- if (_error->PendingError() == true)
- {
- _error->DumpErrors();
- return 0;
- }
-
-/* Db.GetFLCache().BeginDiverLoad();
- pkgFLCache::PkgIterator Pkg(Db.GetFLCache(),0);
- if (Db.GetFLCache().AddDiversion(Pkg,"/usr/include/linux/kerneld.h","/usr/bin/nslookup") == false)
- cerr << "Error!" << endl;
-
- const char *Tmp = "/usr/include/linux/kerneld.h";
- pkgFLCache::NodeIterator Nde = Db.GetFLCache().GetNode(Tmp,Tmp+strlen(Tmp),0,false,false);
- map_ptrloc Loc = Nde->File;
-
- for (; Nde.end() == false && Nde->File == Loc; Nde++)
- cout << Nde->Flags << ',' << Nde->Pointer << ',' << Nde.File() << endl;
- Db.GetFLCache().FinishDiverLoad();*/
-
-/* unsigned int I = 0;
- pkgFLCache &Fl = Db.GetFLCache();
- while (I < Fl.HeaderP->HashSize)
- {
- cout << I << endl;
- pkgFLCache::NodeIterator Node(Fl,Fl.NodeP + Fl.HeaderP->FileHash + I++);
- if (Node->Pointer == 0)
- continue;
- for (; Node.end() == false; Node++)
- {
- cout << Node.DirN() << '/' << Node.File();
- if (Node->Flags == pkgFLCache::Node::Diversion)
- cout << " (div)";
- if (Node->Flags == pkgFLCache::Node::ConfFile)
- cout << " (conf)";
- cout << endl;
- }
- }*/
-
- for (int I = 1; I < argc; I++)
- {
- FileFd F(argv[I],FileFd::ReadOnly);
- debDebFile Deb(F);
-
- if (Deb.ExtractControl(Db) == false)
- cerr << "Error!" << endl;
- cout << argv[I] << endl;
-
- pkgCache::VerIterator Ver = Deb.MergeControl(Db);
- if (Ver.end() == true)
- cerr << "Failed" << endl;
- else
- cout << Ver.ParentPkg().Name() << ' ' << Ver.VerStr() << endl;
-
- pkgExtract Extract(Db.GetFLCache(),Ver);
- Deb.ExtractArchive(Extract);
- }
-// #endif
-//#endif
- _error->DumpErrors();
-}
diff --git a/test/test-indexes.sh b/test/test-indexes.sh
deleted file mode 100755
index 50d54f691..000000000
--- a/test/test-indexes.sh
+++ /dev/null
@@ -1,235 +0,0 @@
-#!/bin/sh -e
-
-# Test behaviour of index retrieval and usage, in particular with uncompressed
-# and gzip compressed indexes.
-# Author: Martin Pitt <martin.pitt@ubuntu.com>
-# (C) 2010 Canonical Ltd.
-
-BUILDDIR=$(readlink -f $(dirname $0)/../build)
-
-TEST_SOURCE="http://ftp.debian.org/debian unstable contrib"
-GPG_KEYSERVER=gpg-keyserver.de
-# should be a small package with dependencies satisfiable in TEST_SOURCE, i. e.
-# ideally no depends at all
-TEST_PKG="python-psyco-doc"
-
-export LD_LIBRARY_PATH=$BUILDDIR/bin
-
-OPTS="-qq -o Dir::Bin::Methods=$BUILDDIR/bin/methods -o Debug::NoLocking=true"
-DEBUG=""
-#DEBUG="-o Debug::pkgCacheGen=true"
-#DEBUG="-o Debug::pkgAcquire=true"
-APT_GET="$BUILDDIR/bin/apt-get $OPTS $DEBUG"
-APT_CACHE="$BUILDDIR/bin/apt-cache $OPTS $DEBUG"
-APT_FTPARCHIVE="$BUILDDIR/bin/apt-ftparchive"
-
-[ -x "$BUILDDIR/bin/apt-get" ] || {
- echo "please build the tree first" >&2
- exit 1
-}
-
-check_update() {
- echo "--- apt-get update $@ (no trusted keys)"
-
- rm -f etc/apt/trusted.gpg etc/apt/secring.gpg
- touch etc/apt/trusted.gpg etc/apt/secring.gpg
- find var/lib/apt/lists/ -type f | xargs -r rm
-
- # first attempt should fail, no trusted GPG key
- out=$($APT_GET "$@" update 2>&1)
- echo "$out" | grep -q NO_PUBKEY
- key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; p}')
-
- # get keyring
- gpg -q --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key
-
- # now it should work
- echo "--- apt-get update $@ (with trusted keys)"
- find var/lib/apt/lists/ -type f | xargs -r rm
- $APT_GET "$@" update
-}
-
-# if $1 == "compressed", check that we have compressed indexes, otherwise
-# uncompressed ones
-check_indexes() {
- echo "--- only ${1:-uncompressed} index files present"
- local F
- if [ "$1" = "compressed" ]; then
- ! test -e var/lib/apt/lists/*_Packages || F=1
- ! test -e var/lib/apt/lists/*_Sources || F=1
- test -e var/lib/apt/lists/*_Packages.gz || F=1
- test -e var/lib/apt/lists/*_Sources.gz || F=1
- else
- test -e var/lib/apt/lists/*_Packages || F=1
- test -e var/lib/apt/lists/*_Sources || F=1
- ! test -e var/lib/apt/lists/*_Packages.gz || F=1
- ! test -e var/lib/apt/lists/*_Sources.gz || F=1
- fi
-
- if [ -n "$F" ]; then
- ls -laR var/lib/apt/lists/
- exit 1
- fi
-}
-
-# test apt-cache commands
-check_cache() {
- echo "--- apt-cache commands"
-
- $APT_CACHE show $TEST_PKG | grep -q ^Version:
- # again (with cache)
- $APT_CACHE show $TEST_PKG | grep -q ^Version:
- rm var/cache/apt/*.bin
- $APT_CACHE policy $TEST_PKG | egrep -q '500 (http://|file:/)'
- # again (with cache)
- $APT_CACHE policy $TEST_PKG | egrep -q '500 (http://|file:/)'
-
- TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'`
- rm var/cache/apt/*.bin
- $APT_CACHE showsrc $TEST_SRC | grep -q ^Binary:
- # again (with cache)
- $APT_CACHE showsrc $TEST_SRC | grep -q ^Binary:
-}
-
-# test apt-get install
-check_install() {
- echo "--- apt-get install"
-
- $APT_GET install -d $TEST_PKG
- test -e var/cache/apt/archives/$TEST_PKG*.deb
- $APT_GET clean
- ! test -e var/cache/apt/archives/$TEST_PKG*.deb
-}
-
-# test apt-get source
-check_get_source() {
- echo "--- apt-get source"
- # quiesce: it'll complain about not being able to verify the signature
- $APT_GET source $TEST_PKG >/dev/null 2>&1
- test -f $TEST_SRC_*.dsc
- test -d $TEST_SRC-*
- rm -r $TEST_SRC*
-}
-
-############################################################################
-# main
-############################################################################
-
-echo "===== building sandbox ====="
-WORKDIR=$(mktemp -d)
-trap "cd /; rm -rf $WORKDIR" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
-cd $WORKDIR
-
-rm -fr etc var
-rm -f home
-ln -s /home home
-mkdir -p etc/apt/preferences.d etc/apt/trusted.gpg.d etc/apt/apt.conf.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/dpkg
-cp /etc/apt/trusted.gpg etc/apt
-touch var/lib/dpkg/status
-echo "deb $TEST_SOURCE" > etc/apt/sources.list
-echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list
-
-# specifying -o RootDir at the command line does not work for
-# etc/apt/apt.conf.d/ since it is parsed after pkgInitConfig(); $APT_CONFIG is
-# checked first, so this works
-echo "RootDir \"$WORKDIR\";" > apt_config
-export APT_CONFIG=`pwd`/apt_config
-
-echo "==== no indexes ===="
-echo '--- apt-get check works without indexes'
-[ -z `$APT_GET check` ]
-echo '--- apt-cache policy works without indexes'
-$APT_CACHE policy bash >/dev/null
-echo '--- apt-cache show works without indexes'
-! LC_MESSAGES=C $APT_CACHE show bash 2>&1| grep -q 'E: No packages found'
-
-echo "===== uncompressed indexes ====="
-echo 'Acquire::GzipIndexes "false";' > etc/apt/apt.conf.d/02compress-indexes
-check_update
-check_indexes
-check_cache
-check_install
-check_get_source
-
-echo "--- apt-get update with preexisting indexes"
-$APT_GET update
-check_indexes
-check_cache
-
-echo "--- apt-get update with preexisting indexes and pdiff mode"
-$APT_GET -o Acquire::PDiffs=true update
-check_indexes
-check_cache
-
-echo "===== compressed indexes (CLI option) ====="
-check_update -o Acquire::GzipIndexes=true
-check_indexes compressed
-check_cache
-check_install
-check_get_source
-
-echo "--- apt-get update with preexisting indexes"
-$APT_GET -o Acquire::GzipIndexes=true update
-check_indexes compressed
-check_cache
-
-echo "--- apt-get update with preexisting indexes and pdiff mode"
-$APT_GET -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update
-check_indexes compressed
-check_cache
-
-echo "===== compressed indexes (apt.conf.d option) ====="
-cat <<EOF > etc/apt/apt.conf.d/02compress-indexes
-Acquire::GzipIndexes "true";
-Acquire::CompressionTypes::Order:: "gz";
-EOF
-
-check_update
-check_indexes compressed
-check_cache
-check_install
-check_get_source
-
-echo "--- apt-get update with preexisting indexes"
-$APT_GET update
-check_indexes compressed
-check_cache
-
-echo "--- apt-get update with preexisting indexes and pdiff mode"
-$APT_GET -o Acquire::PDiffs=true update
-check_indexes compressed
-check_cache
-
-rm etc/apt/apt.conf.d/02compress-indexes
-
-echo "==== apt-ftparchive ===="
-mkdir arch
-$APT_GET install -d $TEST_PKG
-cp var/cache/apt/archives/$TEST_PKG*.deb arch/
-cd arch
-$APT_GET source -d $TEST_PKG >/dev/null 2>&1
-$APT_FTPARCHIVE packages . | gzip -9 > Packages.gz
-$APT_FTPARCHIVE sources . | gzip -9 > Sources.gz
-cd ..
-
-echo "deb file://$WORKDIR/arch /
-deb-src file://$WORKDIR/arch /" > etc/apt/sources.list
-$APT_GET clean
-
-echo "==== uncompressed indexes from local file:// archive ===="
-echo "--- apt-get update"
-$APT_GET update
-check_indexes
-check_cache
-check_get_source
-
-echo "==== compressed indexes from local file:// archive ===="
-echo "--- apt-get update"
-$APT_GET -o Acquire::GzipIndexes=true update
-# EXFAIL: file:/ URIs currently decompress even with above option
-#check_indexes compressed
-check_indexes
-check_cache
-check_get_source
-
-echo "===== ALL TESTS PASSED ====="
diff --git a/test/testkeys/mvo.key b/test/testkeys/mvo.key
deleted file mode 100644
index e1ab50119..000000000
--- a/test/testkeys/mvo.key
+++ /dev/null
@@ -1,1182 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBDgbNk0RBACbHfepY/RojAOL0tqkJOLnJ0ppvoAcFj427ZxdUbEwdwc7BNL+
-XtRgZ1WBURA+qb2inC3rA9a9TrQA2x2luq7XmCVbP7jv0K/8nYqzSHp0oPuMsrCO
-6EhK/XLOzKw7Bk1rfl4JVOX92QFBXodJiaemUok29CXVSn8vUR2lqGdypwCgpiBJ
-zxjf/eSvPp4IihsTC3kke9ED/2ASOhlkfWobIaed47/ehIYc9gvbdMOnoGDrwXN6
-8ba+3FGvtY5qbUKg2HinOYQoBjXW9NDjeJ6b8klpyG2LMAhS2UzPQjhwUIn9WnNX
-Qsvreq0e3ad+kXCjPFjtfjCPno19mPvTSevLEXIUoG02fjpDdHTCxlUq7jdthtPC
-TMCLA/4scIFi2Ll7pqVvNqc7xTLb/b5E9fKsiqdrJMLGqg4cWak84e9UF2tQmsqs
-UohiU9qV5u4HIehraXs9NDdt2PvFgCsEYNtwFdSCsq6q9YtqfgnGia1hyQLE47RP
-J+AwLeZRU9R81gKslD/ouxgj3ctx44hHMtLAFEZU/SqoD6CZBbQcTWljaGFlbCBW
-b2d0IDxtdm9ndEBhY20ub3JnPohVBBMRAgAVBQI4GzZNAwsKAwMVAwIDFgIBAheA
-AAoJEJYkg+FWYsc0Da0AoJL3vvvHdGlRzVKRBUmUk7ldSaeOAJwJx+M17RtS2H7/
-rtDs/FdKgOpyYIhGBBARAgAGBQI44PQGAAoJEHnZRpQA4NBUcfsAnjJyH2KDaapk
-LmWIo8mXbjKkp1nPAJ0ah73TIyMDX46M5keCVv14rEO7qIhGBBARAgAGBQI5XewC
-AAoJEG9cFK2bBJM1u2MAnRm2g0rv3MJcp0+WqJ6gBwFusJLGAJ44gsM1etFK+/v5
-K7fhtTVHVw2p5ohGBBARAgAGBQI5YbDGAAoJENfxTmPdHGLWOx0AniI3REj/jKDw
-rlLox+UMytalnzKcAJ9ymd5/mwd2Vv5xgZpOzlzmOkHM24hGBBARAgAGBQI5czP9
-AAoJEFTCT7U7C7mpbogAmwc+jjRJAQLuwP8AY4oEf6G5MAErAKDIGv+gNkcZM66T
-whLZdmF+SUYcEIhGBBARAgAGBQI5ye0MAAoJEFGs9q11voCXz5IAnivGxujJtmUl
-9qOu2j542xIpFOcLAJ4/IeHXf0Z4UknuqDDRuEK8iLsAfYhGBBARAgAGBQI5yy+C
-AAoJEL/hIGVrIUiaJXYAnjwaPF3bh7P0SBNlD+wLjtQJ/MTHAJ9Y3WWJKMYUg4xL
-F0tHLZyloU9674hGBBARAgAGBQI5zN/1AAoJEN56r26UwJx/QdIAoMfkJQVmLGmZ
-zHOxLMb/EtMGUF1ZAKCMwdQnb1x9ilkIzr5NtNUE/TErJ4hGBBARAgAGBQI51EyZ
-AAoJEPhev0YljYeBAhoAn3wxgOQeBwbCkJyLicdOrzy23Cv/AJ0UTreo2KaFOfcy
-eqdxDSZpt//2hIhGBBARAgAGBQI6Ac4jAAoJEB/Egc/tDXz6yeoAn1lqYvC91uvt
-JmbJ1mPgWOL8BRlLAJ9zSXAy/Evl7ffMmNRmw68hgiw+uYhGBBARAgAGBQI6Lj7J
-AAoJENwT5U6rm2b9hyUAoNKrqr+wFKb53a/2EiqiwlxwMe9sAJ4rmmdg/eD7+gra
-taOyc9hbc9BsIYhGBBARAgAGBQI7QFC3AAoJEHkWLzb39qrZmlcAoKcsJvgM2fLl
-msslzS5C0wPmHp2aAJ9GwhzCzA5m2sfHF//VE9vK7lGP6ohGBBARAgAGBQI7QK1g
-AAoJECm+XSJo/VSf9RMAoKeZR763sZs1FUzDZqO+1P1PvRORAJ4/pPOXrBtUVxtP
-L7JYcby7Pu2q4ohGBBARAgAGBQI7QEqKAAoJEHzz9a8pSZ9h/LoAnjq3tepe77aC
-7A87N4m8ioQNq9EWAJ4r8xJdSV9WJuKOpWO8RhcQK+zG8IhGBBARAgAGBQI7Rdfh
-AAoJEENVU8Xg+cY0XsEAoJYuY/GAwj3D3O2l2/4kpqL/K2bOAKCVFnIXGzmokhUW
-OzEpR9zISB0Jl4hGBBARAgAGBQI7QVVlAAoJENdZXTdLcpYl3IwAnjJg1r1c8SdB
-pmCusQhdlvth9KanAJ4oVB5ClSpXLszX81n3K14E4xgSz4hGBBARAgAGBQI7RsZj
-AAoJEPIPrAt7g1flwMgAoKif05sqy6lgnhOOW0gen5ZDMZiDAJ4lZrdd+We/lzOI
-ItzwaH7MtR7mnohGBBARAgAGBQI7MdbOAAoJEIuYyKIb5v0ldf0AnRNFMcbfelX1
-kWyQ7iwBe8ZdrnBSAJ9XAYyd+YDMxRPgUjPsx5g4bVoByIhGBBARAgAGBQI7SxV6
-AAoJEMCky7mHl4VpMpAAnAiPDNzcAqS3SitNzdfo6um6ULm3AJ45Arkvwdt1rhe+
-XdJb8BmE0csV24hGBBARAgAGBQI7TWOqAAoJEP6aHsNkhDkzNo4AoIG4qZnmAhiu
-tjYUGe8iTHvlSRn2AJ0R78A+6pNYq7bXsX+u2wQCmtKstIhGBBARAgAGBQI7TyYG
-AAoJEF3iSZZbA1iijrIAmQFyBc06cpHnk8Z1jcb1j4hppKDTAKCrOAVms47hOwSQ
-kx77XYYVmgv1JYhGBBARAgAGBQI7UiYzAAoJECTpnxDbPUTUOs4AoKxun2wYzw6n
-X8m2GD852Fvl1ejRAKCcxxsM91CEqa1Dq1ZgSAPcPW4aFohGBBARAgAGBQI7Ur/6
-AAoJEPHSzMhJehdttqIAoLlQ8CR3oGaSFhnJUJlhITxph2AcAKC/D8KE2TBBH9Ns
-Xnd9w4TueW5ZwIhGBBARAgAGBQI7XvRyAAoJEKXycCgJF6nkbZIAn0a/QJMxWZA1
-joLAmTZeZKtpG4kBAJ9HmXc4IvbtywrkN2UUXy6V9EBdmohGBBARAgAGBQI8Bm3x
-AAoJEG+rq7w1fSF4VpIAn2FRhND2RaEf7OzAHuijY51SxYRfAJ0bHBGbLKfiV9GN
-h+8ZeIU4G/ZoF4hGBBARAgAGBQI7+t0uAAoJEO/OC2AEJW07bwUAnRx8jfjEQvV+
-didBZ6royl+EQ+XIAKCEaXBmCylJjiDzzwFs2M6ofr7oiIkAlQMFEDweVsmABi58
-5NR+wQEB14gEAN2PQAo2JeKKw5Ehq5MtNncwAnY8f4k9vMR+bRF+ZQZRSENDseEi
-1NFe0L36ftZm+OPycd6sOW+ItdBQdz5Klg0itVPlneg6e172S97rBC3H9Sadc/s2
-e3TzSO75H17SZQqep8SQ0J5lpVqnZWv8UInw6nlNHrAZnKi5vDCDg2qViEYEEBEC
-AAYFAjtSxtsACgkQO/YJxouvzb1UngCfVU4Tuak2dZvqi3sGpEbP5N3JD6YAoMC/
-O5omvvNn+Y3roJ9DO9Gp5tuGiEYEEBECAAYFAjwea0EACgkQw3ao2vG823MD+wCf
-QMu34w5+e1IVv0SG/4u7OZ+gAU0An14HokAASyR08zx6YWRISe+ut2ugiEYEEBEC
-AAYFAjzOpm0ACgkQYFIoXKh32XgWBACgmj2D12AxjkIKtSAnxaJW0jctpPAAn3gD
-BekKLQ6nxUv/RtdSxgEuJaTziEYEEBECAAYFAjwaQVoACgkQArxCt0PiXR4VogCg
-4Ugp24rAWDTrg087qmJJDSzoFMoAniSj+0jFBN7+Cuxt6lvsYdzIZtRkiEYEExEC
-AAYFAj03JCAACgkQEmi4KLr+iOXtmACgpOsak4ZO2xpL+BWtsV0STUiHWa0An1MO
-+j7+1i/qyUqxK3dBMAAQR6DciEYEEBECAAYFAjz8wDsACgkQL0uj7/chxkPnawCf
-fe9U7VuB6Kmb8kCOuqLD2WdeQ5QAoKdNllTKuajMNuTKu7nK4cM5xwasiEYEEBEC
-AAYFAjz/WjsACgkQ4ggFW0tm2ZF8AACfRKZqobRP7Rz/nMmmjQTicKKRcikAn2ki
-Uout5ll4H8kJSN0xvQtwV/AtiEYEEBECAAYFAjy8heYACgkQ+FmQsCSK63M7qwCf
-XWEy22x1vjjEwqLKfcbfE/KUFYIAni6HE23kn69qjF9JIIHEwUaLO1JJiEYEEhEC
-AAYFAj2hjGkACgkQjjtznt0rzJ2LKQCdGrZeo3TW4KOL13MlTNst0njtV18An3h9
-6nXE3Hz9THRMuxldBfhrPbk/iEYEEBECAAYFAj44b8oACgkQ/5gPV7u/uOHgDwCg
-+VNQMCgxFaNiiyU1c6uppxDRYcIAn27PkEgAjlw0t6xHGSqSUelJONBEiQFABBMB
-AgAqBQI+jbNtIxpodHRwOi8vd3d3LnJhdGgub3JnL2dwZ3BvbGljeS5odG1sAAoJ
-ELbcsCzNGlK5XZYIAKlU2bdFlD90ss50fUi2+sUus7ev3nhPP9VPuN5IO325meNF
-OJN/074ewSHsdiD0323sohtqe4aQp0nieYg3IfC6agEiCiNffFmvs/oMuZKk0OXy
-BBZP3KxHUnz6B0eHN1HxdfrWO3Zt48T4cLEs2cudZHfGnzd/ZsPbxlMe+krHktgl
-FZdX2pm8g77NMD/FHICbypCsY2FLt7huw/pPcLyvE8Wafm8YmgM6biWR5CUglVfs
-IoeKzEdYj/Ys0rht7YGz5yB1U6Sy4JRLDbM1Msx3h2C2J76mV/oogt568okZSGZx
-EadrBn4PdJqU4zFK4t9Y0Pp6imFpraOAOaG0jvWIRgQTEQIABgUCPpGDpwAKCRAI
-XykZwmr06+IRAJ9yHo51a6Swdm2MzcE8NM3AiVZDAACeJPI2DzeXqckHrFmVhMm8
-WSUQcNqIagQTEQIAKgUCPo2ymCMaaHR0cDovL3d3dy5yYXRoLm9yZy9ncGdwb2xp
-Y3kuaHRtbAAKCRCprbf4rk5CXMabAJ9ewWNvXylfEGFtSEl/Akp5HmlcQwCguezW
-D8hrg9b7grq+D8Xa+qhVzoqIRgQTEQIABgUCPw/vagAKCRDTW7yZvH0CCo6oAJ41
-fNnL1AS8lMN4xxVoBudfnj0ENQCZARDKiW3eMp2+bLHKOcaMCF5GEHeIRgQQEQIA
-BgUCPxBWNAAKCRDW+vrdlS8//wK4AKCsH7xA5MH6ctCKrLqFgJVminkaigCfUyan
-WP6QtCkyC8x+wlEAN8g7g6uJARwEEwEBAAYFAj8RBnoACgkQQAYVDkAJ6u1KcAgA
-tSn2vpDSge72G8+oCQrhxcDpob0l33IuBXEFqczV2TO7oUisgiu+/90GeRzUqBvE
-jxg2uX0n+2uYInPbLL0m5rlWgkhyk5tWSdklDz3JLKSK24p48xBjDsAxL8eiYVJh
-HOUrHRIl5imsgRk8Aycey1/h2CfweIrIZHDxGRqtX/I8EO5rG2O/HV3nujPSli6G
-wPlf1aXlV9diPj0mwU5HlCFAB/Akfx8jzcMLbORGYM1fift2c01P/KLTr9szJ8iz
-2UDiNCM007CPwrYS8aAw373zOBhzZnrJLTP7hXl78UYjZWTJlDP1PYWYY5P4gq96
-djvXpDH2WiRgF56LAEg4pYhGBBMRAgAGBQI/ECvMAAoJELM00wiWL9Le93YAnR+n
-8c2tFDeBHcSTIfjRfWjFi0ixAJwJARGAeBLHzHfHfcf15FanE4GPVIhGBBMRAgAG
-BQI/ERPwAAoJEOGFItd8cSvLEpAAnjQ1MpPXRtTKmO9OsMVGLWAe+2I7AJ4zV1mS
-zJGkkFA77QnFy4X0lP5SjYkBHAQQAQIABgUCPxFKTgAKCRAJ6fkKinJORY7SCADB
-UjR1STWfr5rXFjFleiSwPdOFMFj1HJvMVirY9ah2gzz6R+WEkzBesrg8X+Zrgf1D
-UrodM/Uas57Ght3t/ytKJdjfPiCcpn9rcWk7Gy5idpBgpGJD2YG8mATNoXsz4RHi
-evtXO8DFJ87d7fNRv6RWN6aV1hf61MfGWGX0v+qLxzGJtwalC2w6YQVmisF/IuOY
-g1TM3qtj58DPFu2CCaFcLVDpA41k6WvY+haYSoHxw6O8FUMZqCJgvo/rgaulzmCI
-IvPVGqoaZNZcaIqkDkPnXCF7Ol5Gz67SUG4p3meUIJcC0JoYO6rhzrTdom/YI2to
-cYFo6qUQX2xoyHUndGS0iEYEEBECAAYFAj8SooQACgkQ1DyzBZX+yjRANQCgoeSo
-eX3vAk26SuqRyDVfGvhX1MQAoKpdtVmx54GyB15T8KPyN/n8lm85iEYEEBECAAYF
-Aj8ROC4ACgkQ9Wsmo6Y5nnOc4gCgqb5ypf7CM7x9gGK4YLZbcvWAjqUAoJmHY1di
-lrgaafw3qqscNwTey5GCiEYEExECAAYFAj8QZjgACgkQeDPs8bVESBX5KACfUp9q
-RTLm0lLHgY9wPqJ32b1/aR0AniiRO65KcEHUZ5AJA7l6Q8stU3kfiEYEExECAAYF
-Aj8RP+kACgkQ6iGZQSR3yvj3UQCfSgvBuOlVuCOx0U83Zm30mrxsEK0AnRmDl3XT
-kQtv/wOCVoPXS21UaHFziEYEExECAAYFAj8RXPsACgkQGf7YPOK+o0HcRwCg9z9+
-ln1+teEYBfS9QCaX8DYR22wAoOHlbP+t6SnqfoFg8P0rqKnk0N+RiEYEExECAAYF
-Aj8RpBYACgkQxcDFxyGNGNcdmwCgpPCow3W9Gb6xjeKu8bLoC4SWLKwAn3ClU08D
-C3IBK6f4gAG5+Ad9NspgiEYEExECAAYFAj8RwdUACgkQvpyGjQRgTriRlgCeIoQh
-eYO1QF9oYli4AkJKP4Rnxw0AoJ1TGUjnasCUnib0LDTsLkz4G4obiEYEExECAAYF
-Aj8ShtwACgkQoJD705cZn8OiTwCffk6fmJbXPZEjLvz5mMPKqihKEDMAnRDLrmVU
-7Zyr1MTNkEkXUdRKU/R4iEYEExECAAYFAj8SkwQACgkQVm02LO4Jd+gV1wCgp3rq
-b/jQ6p5s7mtGz4nIGq5rWscAn1VG5Y74+kHz3zIc4R6+cc6GfgYgiEYEExECAAYF
-Aj8Sl20ACgkQj7mZcU7rMfFoFgCfULiIrce0s4O8RkaA1/3Aim8vw8gAn3pJeNz4
-xbjG+SdSIkt20PClEdsZiJwEEwECAAYFAj8TMi8ACgkQtGuSO22KvnHtdQQAq36q
-n4gFtu4ocQf1pDaxZRyuEvwjuiRmrOGWRbSwvz0xKWDflYxfHPz17XSbZsTrk3EL
-OoVVlgaSDhwf67SLfVlyYW8lxJVXY4qF55UNQ2+fe2zlJ8TKQd3FdxoRzurkMoEX
-4kay3hTFBH+nRqVS6a848yDEuTFtHSbWIh6asHGIRgQQEQIABgUCPxNhDwAKCRCt
-7CzRGpU359pzAJ9ovdQwBw48LD0l5oj+NyBJHUkVIQCfX6/AGCDhhryIn7wZw2UI
-CZ+I25aIRgQTEQIABgUCPxGlCgAKCRAoxvVrgXw1aAJQAKCQBwJZ+fZpd3wpidfj
-TSsO3DNzGgCbBFivSKHERjKt+BMU3FD/PiQVvJWIRgQTEQIABgUCPxPyOgAKCRC5
-gsvVwOMfHay/AJ4x8E/I6NaP+MZCRghVnBbc/jWXdgCdE4NPmJMYlS4DjEi5yrnO
-GTAoZ+iIRgQTEQIABgUCPxQadQAKCRCAdScAZahB7ZzWAJ9U2/wm19/e5hO6ctED
-OU4tyNX0HgCgtvah2EaEJCeHBtkcxV0gNAkjTcCIRgQTEQIABgUCPxQqPwAKCRBs
-dheMoO2YLdhsAJ9SnpDiEONSVKp4WbNUEdYg0nfQrwCgllFT54PAfK9imNf7oqm/
-u5Gmwr6IRgQSEQIABgUCPxQtmgAKCRA19mF8UTrv2SncAJ9ZGhHJo8mLfyE4N9hI
-du1knh4aiQCbBaPnoJwUU9bdGpIWdG8iO0cBPgSIRgQSEQIABgUCPxURowAKCRDV
-Tq5LyZhwscfrAKCOEb1D/zxJhDXZwpbfsxzOxGCM5gCgxwjjBCfa0eNRDEliX8LT
-LapqULmIRgQSEQIABgUCPxUs6wAKCRCJzUshYHVZ5vz+AKDIHISOOuQrtpEOsZuA
-IbCsGxuMVgCcCx4HWZUoDtnUQCwKQ1qdoNLGo26IRgQTEQIABgUCPxZujwAKCRCE
-LNt6RHeeGHlBAKCcghKXmdVvFv24BmjjNLblVkI19ACfTmvdtA319OVUdb8vj8qk
-8u6iRvGIRgQSEQIABgUCPxV1MQAKCRB8IsOfgHrFOu+lAJ45JtfYzbCAQg8zqq9b
-KYuPnb9QNACggib0rObV9FWyAtyU+YPdzpYdfcOIRgQSEQIABgUCPxUSaQAKCRC/
-QVlbc3Kipde9AJ9k8+gTNbm0kCZQR/Sr7nUp54qT9wCgozihBCCCz1UlyKlpuoPB
-Lyqn+Z6IRgQTEQIABgUCPxRl1AAKCRCUj9ag4Q9QLqUPAJ9osOfIVyhbJsJG/jaW
-bPHLlhO+4QCdEndVlz3FfEIvIqr3un8aS2mnR8aIRgQTEQIABgUCPxRl4gAKCRC0
-deIHurWCKZ90AJsHI7U/TK8ASY6qQnCs319TrsoiCwCfbzBLW6IrbkQz2ooGCWKv
-XGNZaqeIRgQTEQIABgUCPxVtRQAKCRC7VaR/yQHDPnjcAJ9es1zm1Kbba+MQpMJ/
-W7LoojAEQACg/qe/YgPY8kc3XIT3GTAxt4uU2NqIRgQTEQIABgUCPxZZigAKCRDn
-yduv41bvwEH/AKDAx7U7T+mag4+nQgJt3fVtBaBotgCfUc8zZ1GoO+4nl6J16HaS
-383ZMoOIRgQSEQIABgUCPxcIVwAKCRB3+BUzuw7ox4LhAJ985s36sd3XVShLnNSs
-oWwBCASHuwCeMR+G2M9etc91AwWmWTAa7Cm5oyqIRgQTEQIABgUCPxZaGQAKCRD0
-tLDMeX6/q2ixAJ9s5BGe4RAXi6h8crxOe69xY8Z2UgCfa95gIjyGx/78TvCxTld1
-rN6qsQCIRgQQEQIABgUCPxe0rAAKCRBGzFxj8xilakodAJ44FYFEomCpZ8fZiY/9
-kuQaxxSvagCgulF5/z2p5KjhzG3WB/ujP+VIhSSIRgQTEQIABgUCPxfUcgAKCRBT
-trgdwTzuB6pxAJ95M7TpYjim9ooeyC1t8escuno0LACeOe4iq+6JWhZcow3us448
-Duvc+IKJAQEEExECAMEFAj8Whg2GFIAAAAAAGgBjc2lnbmF0dXJlLW5vdGVzQHBl
-bmd1aW4uZGUiaHR0cDovL3d3dy5wZW5ndWluLmRlL35iYi9jb250YWN0L3BncC9z
-aWduaW5ncy9ub3Rlcy5FQTcxQjI5NjQ1OTc0RDhCMzQzRTgyMUU5NjI0ODNFMTU2
-NjJDNzM0LmFzYyIzGmh0dHA6Ly93d3cucGVuZ3Vpbi5kZS9+YmIvY29udGFjdC9w
-Z3AvcG9saWN5L3YxLjEvAAoJEKseS2BGdWseknkAn1m1/xMVTIsJr18NZWVWaduY
-SisWAJ9zpOZlUDvxUgygPf8qxpw/+QjhLYkB1wQTAQIAwQUCPxaF/4YUgAAAAAAa
-AGNzaWduYXR1cmUtbm90ZXNAcGVuZ3Vpbi5kZSJodHRwOi8vd3d3LnBlbmd1aW4u
-ZGUvfmJiL2NvbnRhY3QvcGdwL3NpZ25pbmdzL25vdGVzLkVBNzFCMjk2NDU5NzRE
-OEIzNDNFODIxRTk2MjQ4M0UxNTY2MkM3MzQuYXNjIjMaaHR0cDovL3d3dy5wZW5n
-dWluLmRlL35iYi9jb250YWN0L3BncC9wb2xpY3kvdjEuMS8ACgkQGaJoCYg4/ZRS
-swf/d/l/jDhzqfSTDH0IpH1vTt9k4+qN0LSVv2z6keHd3LLS+QCVZAGuNuJ0zDUn
-oGuYfGccqLOMgnmTR+wQj1pROA1cwmISpZUn7Mwbd2yQ7KMix12/Gp3dL+KfE+UX
-DILLeZgod8ZyR35Sq17MsdFLMl9OCBCNCRigbaTW62be5HApsayOX8DjCUnkccnI
-JDqjFr9rpPlPOixLzzBi3ymLmt/Us3gXPnDIvQ9AOjk/xrLkvqibLx1SnehXuclq
-Xy1fGz70/VURD15FKR+EZoAC/z3KSt+yi5LF1rQ1JrvgWi3R+UaiQlWhjc2Y2+pC
-s9MzNJ6ajY7JebQloTBXmTZrd4hFBBMRAgAGBQI/F/CrAAoJEJEfSuaGoRjm0bEA
-oLmnPfLKN928w4MCbe1NEzN+JZ4pAJd7Qupi2vK3rYjHL6at7N0k+h3kiJwEEAEC
-AAYFAj8WkE0ACgkQ722CQfCBGV24GAP/VUmlNMWdNqADJeAS9sgmuwY499HBfxKC
-GPoUJQzz1Kp8UJUErXW0lnZap3Ovh+QWdZOGOwpcFjs/ph27SH+skieKjg+X8IsA
-z7zN+P7UJ8NDWuVA7WWlgJuubDPpWCOxcDcxefB+qUL8L+riWbmylEjron6SvAN0
-44J9fSSeCLiIRgQQEQIABgUCPxMfJAAKCRDQGfXvkCeriFR+AJ4+NtZifShtVwlF
-OmhpQeVKb8MZRgCfQfCYbEjyHmj0dkmBa1uBB5q+E9uIRgQSEQIABgUCPxh7XwAK
-CRAzCwOLbGN0bd7PAKDiCGbuxIi44hNaZp2k2iopmZp+ZACeNb4Xx1QC/UfFYIUU
-GyFaLy3AkjuIRgQSEQIABgUCPxh+JwAKCRCxqd2C3IFLCedaAJwI5NSu6QLC31Oa
-RVhwK4fMj2mRHwCaAv58aG0NwzECcAB9Q2CMu3+FnO2IRgQTEQIABgUCPxfwYQAK
-CRBWQSbyKfGb0fu9AJ0ZDxRkyQrTjBgZFNhmgLkkkc4T5wCeP2xiAp58UrX3zOlB
-gT5AKMrqjWeIRgQTEQIABgUCPxhKFgAKCRAadH5FMOC52MvlAKDfHIejXjn85Ryc
-Vfjx1QZfkr9l/QCgwWteC336NJVKdgNTL0e/uyVjzTCIRgQQEQIABgUCPxh0/QAK
-CRD2KOuTR0MgbNw+AKDVZRvEepBdgQm+WtRWY2pZyMK+IQCdE3CgB8xrU5PEG4hA
-qLSARu+9pAWIRgQSEQIABgUCPxkroQAKCRBl3zTAK1+F49K8AKCPN+Q80sOUAfGi
-yeaS62P21Za71wCdEiU6eO1A/G8AoAfJBOnNOasFJMmIRgQTEQIABgUCPxmU9wAK
-CRAh7E/chK1nbCH6AJ0Zs14KeXxHenncYDYQwaRytW/legCfalBDlkhqD/GU7Xic
-XkIntVILRoiIRgQTEQIABgUCPxplPwAKCRDOinnXmAFtxxlSAJoC0dP/HCw4x2j2
-u4ljZSk5dQh6YACfTEtkWHXY4be31uF2iqf9fcOpGOSIRgQSEQIABgUCPxuRvAAK
-CRDsDq9xNneAJV/IAJ4phQH4WQ317AHgTlQMU+fqHJVNMwCfcXX7srpJDaUj3GkU
-ETUmfROkgFqIRgQSEQIABgUCPxwpdQAKCRB014DXvzux3bjTAJ9cDtHwxak4XAXy
-SKhGvMOEcKIGWwCg0TkJU1hJ7lOD88MI3+GZmP94NfSIRgQQEQIABgUCPxXJzwAK
-CRAqJXt3xjco0mMDAJ4/2AWeFl8bMr112JR9YutxOATUAACgiTSoWjRDj1MT82Zk
-ljcQbsBYvYGIRgQTEQIABgUCPxAiUwAKCRAC1u0h4yxPSzEVAJ0TiCEpUwGnQNXY
-vcxtdx+9DYKM0QCgnkP2SvxPfAB5RZHbXkWB3iN4FxKIRgQSEQIABgUCPxx7wQAK
-CRAL21Oxos+KOADzAKDMIFe5u8tfUq5pyaxAK7NyrWx0ngCeOlp6LDGZSOPyV1oH
-qLQDAJrs+8WIRgQSEQIABgUCPxzaFgAKCRDID3RZrcKezYVqAJsHTfZZV7NhFcrr
-jglBZAixUHnNLACfcZMmTNrQoPpfPgoAiM/g3V+E3v6IRgQTEQIABgUCPxW5gAAK
-CRBL7yYkIt9Ah3cRAKCMCv5Jx7psrcqAkn0Zx6yojSeAOQCeM1Ub3yM+XcRuo8i8
-HS2SUygNR+yIRgQTEQIABgUCPxW5iAAKCRCVZB9rJT5Y45LMAKDcLu+jtrA9WqnI
-1UPw8I+suNflGACgvZ21OB2nPFvzsBDJQSY921C2k9+IRgQTEQIABgUCPx2AngAK
-CRA7v893vYsFDTTDAJ40XIFc472Yv+8gHICgcJTG8ATHbACcDloWcwv8vSnABT6R
-JV0U6bPBmu6IRgQTEQIABgUCPx2UZgAKCRAryEAWIGh4lYF5AJsHGbKmJXb1Qvx7
-1c6n2jNWmK81gACfYbmpioevt3Y3KSjlf12OEOxSFy2IRgQSEQIABgUCPx46sgAK
-CRDMAZrE/xbW6PbNAKCebFEzvR8xnYAJT2ckk1I3C3qOsQCeNZbsexfRL4b+dDFC
-cRBCTqSDpz6IRgQSEQIABgUCPx6ZMwAKCRA0UO1RP8wqkGZJAJ9+DCk9lV2Svnd+
-l+7u5aefZL4cBQCfdCD+yUvcJj9isbg4RCgKkqDh5jiIRgQTEQIABgUCPx7TtAAK
-CRAo7rNaPo3MwJ4hAJ9dXJK1bIDR5/0GEOCLHnAV3G/bTQCfcwoCvpk2gKUbBADC
-7JfNvsn19tOIRgQSEQIABgUCPx7ZUQAKCRCSvJR2Y5QmXiREAJ9kpiEYox6slmxY
-NI2Mse4nBv7I5wCcC+sOnQ0lMumt6KJjpav5GzKpbIaIRgQQEQIABgUCPx8BvgAK
-CRAo3bD9Gcm2ukpkAKDAiwTTAJsdKVc1VhOBERBSqQ/uCwCgqiVGLPYY3+VrNuH8
-xaNCY5OsuKWIRgQSEQIABgUCPx7v1QAKCRAakE+JnAT0Vn+CAKCOpLwh3WFEdR05
-bhTihE3sr4oLEQCeIalp5fJMik+TJdAUilxf/cJUF6iIRgQSEQIABgUCPyAnywAK
-CRAD4Yxrg+URDwflAJ4m3noUwZQmNE5y9rr/3zXmtWUHigCbBYD/QUEGD+rbosE8
-yu3bxELdHJ+IRgQSEQIABgUCPyESpgAKCRCkU1GZ6fLHRySNAJ4yOHY0XnCL3MO/
-ccT45BkUls6ctACfZ1G/ojmCshoejKeEm+V2fjCy4leIRgQTEQIABgUCPyFzPgAK
-CRCUmyXsB0RyUrZOAJwIHTQ9q9fMrKLrYwNcvbhPZXO3LwCfTg+ynV/d6VVli4Gy
-x44xSEo854uIRgQSEQIABgUCPyLsxAAKCRD6jjeQkFE49AgzAKDBiS576xIrLq8F
-rXoel/BKxEbxWQCffVbXx86q6BfQrg9je6j2KcKKkN+IRgQSEQIABgUCPybB5QAK
-CRD0PnJmPMiMCfguAJ9zNZ2SHdPQt9mRs7fmJ7eFzXL+yACfSRTv3/LMwz0j/EIE
-LcjTMlwf8l6IRgQSEQIABgUCPyOdjAAKCRAYoMyNVwaktIGXAJ9sx9LPQiA9J6z2
-FkB9qhbl17If2QCcCCtWo1tICBg1P/ExTA2BwnFAauuIRgQSEQIABgUCPyPEAQAK
-CRCUT8anamoLvKHtAJ0TyFAX6asPnzbpFBjLtY6bzFqeBgCeMUofVcspoa/0/YBa
-A8hSD9Qd/I6IRgQTEQIABgUCPxvrDwAKCRDYDvNai7Unr5ilAJ46rCD0b3Ywssdg
-c/bBBUS9kgUzkACguVCo26BCv86vOgOBe2wQr9qEPZKIRgQQEQIABgUCPyfZIgAK
-CRBvI4vCT9paDCFcAJ96KZRIVSLr+IrMrYoHd/H4r/R9uQCgioG+kSWctJYlqMxo
-4fatptDbM4CIRgQSEQIABgUCPyfefgAKCRCfzyzNPz5kJqT2AJ9qA0P5h9X1TZ2t
-ckVTEt1NRX9ydQCeOsbIvSvlfxdI72Bbpb6Uj8k1uwaIRgQTEQIABgUCPygYAgAK
-CRAEMjbrEHMZdzbaAJ9TNJBBoYV7cPOsEtIm4546RqsOgwCePRaDLbRQ+zojgFYE
-0l7c5G2kacOIjQQTEQIATQUCPyjtT0YaaHR0cDovL3d3dy50cmFzaC5uZXQvfnRo
-b21hc2IvY3J5cHRvL2tleXNpZ25pbmcva2V5c2lnbmluZy52ZXIxLjAudHh0AAoJ
-EKR5zcRatGBq87MAn0fdtv+HO8PkzE0jwcJTFq2mBMVAAKC/cq4wlxqxRnnHq0QB
-vHPbR1ZKv4kBYwQTAQIATQUCPyjtWUYaaHR0cDovL3d3dy50cmFzaC5uZXQvfnRo
-b21hc2IvY3J5cHRvL2tleXNpZ25pbmcva2V5c2lnbmluZy52ZXIxLjAudHh0AAoJ
-EPl8+eM6S39dX/sH/3xKPJriQO+GAhgL206tg3CC0HD7szn4zstqcokgLuIDhnBU
-dnEHq8RH5Cm9y31wfSJBhs3dhJD6cLEBKxZmO05T2eklYeGyhRzL2MH7PAj5oIHx
-Xds7ue9k1OJbBlEugj0SQaO3twWv8DM68ynpSV89r7vYQXDIB+rDJBSUy38f2Sf6
-QEf31nThMgOo3zxg0HTnFqTZxF/Zxl+qXb29g/LIVo9Ro95AI62DDLbeBbo3ofX6
-pb9+iLLBO7gEp+jzLYWITpbS3yG3N+3kxJUSxHFkTVVnKUWdkkF2ba5VcdWOU8h0
-qCjds6Bd6AL9r1d9+OTAGNJo1/hKJmHB5i71HAmIjQQTEQIATQUCPyjtZEYaaHR0
-cDovL3d3dy50cmFzaC5uZXQvfnRob21hc2IvY3J5cHRvL2tleXNpZ25pbmcva2V5
-c2lnbmluZy52ZXIxLjAudHh0AAoJEHkFdo91hPXYWbwAn0wIO2rpKpKPbfLlYPLR
-qogcYL7MAJ43Jo7qeNvX7+R1Y2egJKUMtJv/GIhGBBMRAgAGBQI/KO1zAAoJEPnQ
-FPA4yYWN1J0An2MMMdigRu72LLgPs9y+N/OcBo53AKDR4YObuiiSusq05/0/IpRP
-SpyFUohGBBMRAgAGBQI/KO1+AAoJEF0Pf0ng5J80GzgAoOw2yq4lnPopbXJT7NbT
-SzYUdQhpAKD5nJtD1PBQfMEWX7+E9Q2eeq5LMIicBBMBAgAGBQI/KO2JAAoJEBuw
-i78qkjIl634EAI1vXWW3JV4mRLWURiatAXE6ELl1t6zkcacP+VfsSpABqKw+/6Ga
-rnpnS4/9Eg4RC9F1uHcx3HrZiWoJMdrmJX89QHuCF7t4d7DJk9HOSlL3LkGCe9m+
-Z1rflATrtr1MykMly8P2w8GeEsegeP/qpXA5M0IT5R5Ydq8/bcDayvBXiEYEExEC
-AAYFAj8tVsEACgkQLJg+WtKKVdaquQCg1IXH52P/zc3SAg2BS9fwUrFfT6sAoLLv
-pZMGtQr4Ls1ENx1vLn2/5tYSiEYEEhECAAYFAj8ueAkACgkQEgljnRFKqFzSIACg
-4Czty3NmmCDd7ZytqaDYpnluyZQAoNXXygq5k5mFRSrYBNbKLQ2pTmcpiEYEExEC
-AAYFAj8tjjgACgkQTvSphPLKucgE6gCgh9l3Htk/cN9inNeozu2BxwCVnTcAn34l
-GxnITs3t11dr5fgeWntxWojQiEYEExECAAYFAj8zVvQACgkQyg4WnCj6OIrOcwCf
-WFi3qRdARzOjOzHc7e3wkE2Y1HIAn0sI6DnpFArA2q0B4+QATJtwNWNYiEYEEhEC
-AAYFAj8fL+EACgkQ2tp5zXiKP0wi6gCfZqoOI9vrerzDqwaHpusmhWZNHf4AoLxr
-H4N+VDTFpyf2fcF6kOjTdOI8iEYEExECAAYFAj85JnEACgkQRcAhR2mr3VTtWgCf
-RkvdJ+JLLABz0Rf8jUElesJAKg4An0T9vtCGack3TYp20xrkVjB1Y5E5iI4EExEC
-AE4FAj8fB3FHGmh0dHA6Ly93d3cubWF0aGVtYXRpay51bmktYmllbGVmZWxkLmRl
-L35tbXV0ei9zaWduLXBvbGljeS0yMDAzLTA3Lmh0bWwACgkQ3oWD+L2/6Dit8ACf
-eJyQ4Ug7UTwpgMM0bh6ivqV8O00AnR56LyPYir8xNMEDvhxW6CIXNZTtiEYEEBEC
-AAYFAj81i3wACgkQadKmHeJj/NTf2gCeNIpt7nvOdpIk9TJvYTJSn6iLUaEAnR8o
-uhq4erZO00NEtc4llNzaPfLSiEYEExECAAYFAj9ka/MACgkQZmZxetuDVnmoNwCg
-0J/dSioWrpCswFEn0FjT/nDiSWsAni0xT8LTtc3rlMblmleweYHChwEQiEYEExEC
-AAYFAj9kbAkACgkQDZZLZlcObeqx0wCfYoj+KssyUhVS56GB2WXKuc4sorAAn3Ol
-tD2OAjvwcuLi87npRTTXQbtjiEYEExECAAYFAj9kbUAACgkQTgKsrh3Ws4Bt6ACf
-cBrI0RT+qtOaq8ZASC0I3OAlM3gAnjR5oUgzTC+9U9M9jdpZvT0BeSSxiEYEExEC
-AAYFAkB3KgAACgkQpD5tJxKCh+jl0ACeNPz/WFH/10uxp2l6/90dV+2ElwsAnR0k
-7I7LxUR+O9SuzpPueEOYqH8ViEYEEhECAAYFAj/cWFEACgkQxRSvjkukAcNBMACf
-Xfg1gsZGuwz9Dh61eZ43DrNYiQ0AoNtpKAN53n6fa7qEzw0o2cC8Y2soiEYEEBEC
-AAYFAj/pG48ACgkQZKfAp/LPAaiEogCdGd1scuANXPxbF4w6df1zGChirXkAnA1w
-uWcW0c0cO2HW3ABlahR6wPPBiEYEEBECAAYFAj/MNCYACgkQoL6dujuIbn3dhwCe
-JqloDYulF0Gs33SEON55laT7fVUAn2QVkMisnawg0MbX6THp1pLAdBTriEYEExEC
-AAYFAkB3tZAACgkQhnv5qfvT645O3gCeNCTIuIs9+6w3jqB7GQaLXXpUueMAoJSP
-KUrk9dlxe74XK0fedbmaKSB4iEYEExECAAYFAkB4vOkACgkQzN/kmwoKyScqLwCf
-c11cQ2SYeDBEFhxb3Qc5wFL/AXUAoI03ZmLsly+9p67WmuY114lh7jpmiJwEEwEC
-AAYFAkB4wnAACgkQq/8HtEbzIS2zVAQAqi9LRR7bEeL/KZTYonpAs076eUkjxksX
-2Ls/ecQ/3ERA9fze4Em0XHGOLAVzKw4MIv1oWRiyfzXb+6J2lGw8e9zQM33Y/Y9Y
-Dq+YC0umSiPHtL+225dQdS4HXmfex6sDigG5sZ/cou8HYBwR5oIHD6QM0QUbfj+Q
-plk19ZhEHxGIRgQTEQIABgUCQHnwrwAKCRB8O3lwiMfB932kAJ0f16e5tFae3JN3
-61C13Tx0ck3waACghmo7zp4EAuxr3FJW3cDeMeHR+1OJAhwEEwECAAYFAkCX0dQA
-CgkQtWeUZ0c/fvoaHg/6A1i9isPv/kxiOEI9unftpwweApV3k61hxwrd6auy8Gt6
-2oa4/KgU2S6uZkUamO2hQpfNyXX9iTF0XhnHysKBDnyv3dmfNKAfHB/RCLqYWjWL
-zABHvN65BLav4Dfa8yizbiwbx+pnKQomr13i1hcL3h35ATw49TagyJPQzCUNtfZu
-C7Rj7QeMmmVM8VTqMRRAET5lqdUVuB1YHnc1kuER9JWYmatn0AnX2Szkj39gi08h
-K6cq9mIsjCi15jhuY5onYeQmVsnfOBCZmJ2XyFzex8Kjlf6rZDrt67gRZAc9noov
-eL4Ifw/Z2OXaWZqrNa+yvWR+y+0AXlxGzlZTKrSr7MFbsQ8vG06G3K68n2pX7iku
-AVvF1RDkFZuFRrde6ggl99DlbngM2cgRJne4AzTKJrgzfOOUD6SLDFdaFTwDHP1q
-kGPV9d2jN3ZOUG5ZusNbM+74e+3Oo7XLW1j011auC6SDrv6ndZQ9Z9vZdYw4tI47
-LWBxYmZ9CpC2GqCpstZiovYjB4RxrYiQNLVV9KkSLyoreHrBb5JLvgounK3W/3JV
-qDdqg3ZZobP0JQh5UhavlxzwCK6idp+iBcUHC3CtEeytz2bExh49wLfmLWpEFAZz
-l50A5fvvgj5AjeQiwGoTrD6I9l2KRu3fvmgXjZJAahZz3NyyDb/g9TS8fvY5c22I
-RgQTEQIABgUCQJy1rwAKCRBDGjztotfSkrrFAKCtMRim/eEp1ZZQdLqghyfBv4KO
-sgCggyFU/TEAQM4eiK7lZTZcDxkHt1eIRgQTEQIABgUCQN7OIgAKCRCzdT5NUUs+
-fElcAJ9H1NGrQc/RCdJO3XXpwazOqDlWsgCfVJAy3/dzjdTEXIuzunwcMOatemqI
-RgQTEQIABgUCQOaoFQAKCRBxXtagfnuKyUNQAJ43EoKiOLUgJQmOhPX/Mfnx4C25
-cgCeKsuX7YXeCNS0xzT+00bbISBmEgyIRgQTEQIABgUCQQQIbQAKCRDbTMxLKjDX
-KVk2AJ9DFIsf3VdcXXuD715uRFqDWOH/vQCfa7q9DAG/s0zdXQ+rPNQE63pqmb+I
-RgQQEQIABgUCQU1UxwAKCRBLIOcA56zBhyyCAKDEcrORvNKFS6a8+jDCGXbWmd8m
-VgCdF6IW+ohQTfxmbsWNqp8066ix2Z+IRgQQEQIABgUCQnIiswAKCRDT+ZXVd2r+
-Em3+AJ9iOcXpqIA9u99C7v30zr/WxgsEkwCfTLANSobqy/GLvVyItLjiGrEFp4KI
-RgQQEQIABgUCQ7l+AAAKCRByHrGwzuRJeEZRAKDphuCQVBHnJ0jNRt5gE6ry7Bjz
-+wCg3X1hA3hzleqMay8Kazhx5H1+712IRgQQEQIABgUCRBqs7AAKCRBBUuHxxnGG
-/61lAKDr6KW9NaW7hf9+uQ0+sz58icccrwCgkvm+iYD3ROLubSn7ZmtTa2Xh1caI
-RgQQEQIABgUCRBqtCQAKCRCqDNHu0ItH/tFCAJwL56EGCMAq/ojS4PlLwyWFlCnz
-rACgjKI++vABdNS01zi30QJMSf6OS1uIRgQSEQIABgUCQfwrkwAKCRCY8qTu/+W0
-tm4fAJ9+N/ujThD65SquB2oBmyXsQTcBcwCdHvcqGVYM7/u0cZwY3K+jIAA0F6mI
-RgQSEQIABgUCQnIN3wAKCRDz6FQA1wqv+UqaAKCjoNCBKl+bwWkdTGHuyXmlOZEI
-jQCfVTKpX8xgxXHqv6k6/ulMOUD31YqIRgQTEQIABgUCPxvrDwAKCRDYDvNai7Un
-r5ilAJ46rCD0b3Ywssdgc/bBBUS9kgUzkACguVCo26D///////////////////+I
-RgQTEQIABgUCPxvrDwAKCRDYDvNai7Unr5ilAJ46rCD0b3Ywssdgc/bBBUS9kgUz
-kACg//////////////////////////+IRgQTEQIABgUCQHezHgAKCRBsv4suVls4
-+UPzAJ43hajJMePyTwGZmhE077EeXOtXSwCbB27L/y+tt1DooFNT64/skgJXC/6I
-RgQTEQIABgUCQdHolwAKCRDg0NExEXGwT+X+AJ4/oqNYw44Nxn/N1U10XRpumuJi
-KQCfRJrb6+M7rLOidrXahHwMPkeBURaIRgQTEQIABgUCQjgRawAKCRCvc7YIqUBQ
-r8bpAJ9UKImdTczoRmWQZJPu7niWnc/HDgCgihWFL/uI9cKn0vGVUcFHbeTNEx2I
-RgQTEQIABgUCQj2ItQAKCRD4LlzASysrntXeAJ9JwtUtRj2W8n0JH/wtY0Rpb0/u
-QgCfTcAzoL0d/zdonZ/FhkO37xLul4KIRgQTEQIABgUCQnI52gAKCRClBubU3U1Q
-iJpUAJ4nQBuETnRFytABRiSMDvuK5hYrHQCfQXL1NfJx6AnyhfUbw0lxxmHgrpyI
-RgQTEQIABgUCQnLGtwAKCRDdynmcYUNN1kMSAJ4oQy4OMkrgajvGeJDjQvLdJj53
-sACgiYCiSwosFpVz9oSCuQeZ7qsfSDaIRgQTEQIABgUCQnL5HgAKCRB3/iD+qmq1
-y7vJAKCjoEjo7K1aCa4RmWCxf1/0/Us+8ACffk8KjrIdrDJzVdM5NHXYcD4SOO+I
-RgQTEQIABgUCQnMYogAKCRCf8lg+aBtkaRDtAJ0Wbit7y4DewNZiBCGAsGo66oif
-qQCfSXKgIleO9Fddnreh8vC+Giw8B+yIRgQTEQIABgUCQnWmLAAKCRC7xv+5oCEv
-5Ge2AJoD5QCB1+IlZXc3W4rkAo9YjxWtZwCgoI5I5XPDMuGsJuHSnEnOJnVHSzuI
-RgQTEQIABgUCQnXM1QAKCRC+PO1Hxs6gya7dAKC7l9PQFrr9MyxLqIwSZzKAJk5Y
-YACePNGy/wNgKhMtAzKuHL7jZhLZviqIRgQTEQIABgUCQnZInAAKCRBGxZjby+xf
-gEg1AKCM3tdxh2s8lbraHdWScpUBu+6KIQCfaY/hU72wV17KVG9KXwETr4iH3E+I
-RgQTEQIABgUCQnZLrAAKCRD+qzY2RbLXWyVqAJ96fiAU/WzVe5IDnokDrQBNYLlO
-6gCeN4wtjZA0LYNfdJv+bfqvdltTEe+IRgQTEQIABgUCQncqMgAKCRAN5ydtXgV3
-8l/EAJ9GWZl7Gvl4kYK9i7asA6mIz9QlNQCgyVPu0fzbUigRBskerqJxYz0qOLyI
-RgQTEQIABgUCQndHTwAKCRAO3cXyakXIFuBMAKCMtXYLJmQDdCSzq7qFfYTg9NZv
-FgCbBQfXf2EpHAEQwopSz7tHCuHnBXWIRgQTEQIABgUCQnfNGgAKCRBKw5P7otBp
-NrpLAKCJckctqEq/jDqEfcdHajtLJCznkwCg2sKvB/LlZtkOuoIneZfWx1/nnsqI
-RgQTEQIABgUCQnjY0AAKCRBwmj9gO34W4VmZAJ9SymG9oRHzwTowbe4MAJWTKbj/
-ZgCgrzoZwzz5v/PY6bJr/oe1dTxjB72IRgQTEQIABgUCQnnJVwAKCRC81a2QeT9r
-AqyeAJ49eMAaPQQw8ht3oKZGQlza4L+w2wCfcMvbc7JzONfXHCNywWgXx46YUp6I
-RgQTEQIABgUCQnpNxAAKCRAf15DD8aLe1bmWAKCsZCQraaj3Ia2nzHgSasIlWP/j
-zwCgorjV199hJOvdXBHhwRGyeCXBV5GIRgQTEQIABgUCQnpe/wAKCRB6b+tv/1LB
-UK7sAJsHbW4PC8zevjnWXn40ihmDKVC/EQCg6X2LQ+1XGtzaRhhDUfy0GVAupd+I
-RgQTEQIABgUCQnrUIgAKCRAGUeUmdLfHKrXfAKCeheZcLx9lUd5BUwa4bPYUAxKq
-9QCbBJvviKSYdJxXZNlmld5S8YC428GIRgQTEQIABgUCQn7OEgAKCRA8Y8o/oLPo
-ixoUAKDJeK/rhuKpG26/lRihhVo+64jR2wCglAqCyhcczML4A822cTShr16b3piI
-RgQTEQIABgUCQn8UKgAKCRC4lA5tqXtpoA4rAKCwrHn5dsY/nuRdxDsQPtslJEDE
-bgCbB7qvCrfdAXXYTpHH0Cd/Yi9ysp+IRgQTEQIABgUCQoJaUQAKCRAT3U4YLkTT
-yvhDAJ9fb8ubNZE7PaVVzoO7o9YzRSlOawCgr57n+WuJ4mNJgKt5ZgC+95uzEJSI
-RgQTEQIABgUCQo8wzgAKCRD23TMCEPpM0cqBAJsHXmTB4bzFtQL9YD9+xNRCR1ay
-EgCeO+/L9mNHBDbQOAwZAR/mi0G8L66ISQQTEQIACQUCQnLueAIHAAAKCRC4lA5t
-qXtpoO5/AJ463NgE78T3zHUXvOx6d5Ru+cyXkACeO3VkUyPyQbJIyM9sWEAgg8df
-YySJASEEEAECAAwFAkK3NbwFAwASdQAACgkQlxC4m8pXrXxOyAf4jmnjn7d62EwR
-rSdmF1j/mhMppsV4ESOdIv44tJm0Kw4WOkYZ/M+uE0Ti5U3sQrCoFe7aMSuZnJQp
-XwEd4RlIPjGx26FyI2Pcn8rZsSB7wjarUjvS32pDMtrL3W8V68wvWeiBOnt77OUQ
-3MLV1W6rVTKNCsGhrJwTt/EyjmeqqPxILvGTbDLtlwRrK1NtQZZHR1AVnJ75H1Ia
-uyQUFzpI9TiY6lCALDhIPb6K4UlhI3Bqw8l4Ig76tgNa1JZoUTpyaDKM0qMKkPPf
-Ne0/k8SsxlpDck2tyGJAFQIAzC6ekcUHK2QSlu73wIB8m35dvtahGYPmW39EdYAR
-4rmFdCu6iQEiBBABAgAMBQJBzHa6BQMAEnUAAAoJEJcQuJvKV618YR0H/3alOq4a
-MkPVB4ZN8iKNAx0Gg+cA4ykx3su4fuVfI1vuweZIPRLcGdGKubSjfiPOOpeljuwu
-2/IQv70GHfucaRzHSRuDO2T+dShN+N6/IuckyeH8eAOuF2H2F0/otqRCgwOfM0mb
-Rz5iR7/A6l59zBeL9TeZ8Bd+ZlaihRNrgsjdP1N/PJbkzithXxBPCpE87JHsNVdF
-6yTRQgCG5T6J0v/wAJ4JkS4QGMJBBP2gK3n8sPS+Wo5sH6I8AflJQu6ML2By8pBV
-03S961UU7xXv2ySI5/RhuOceLcxoLoS6xy4yrPtxVs4knQ/b18aSTa4UiiU4saon
-m+nCasQDlFnY25qJASIEEAECAAwFAkHdmv4FAwASdQAACgkQlxC4m8pXrXxo+wgA
-sU34Mms+OFXufehaXjXfphBvlI7n9n4gqX5/ihH9WcP2IKObNXAd3H1HcOelTeuW
-uYDHdJ3yUF+cUN9+wDEzZsI5pYNqFmb3b2BcZMd1a7JItqC8Su3M73AXp5vCNjA0
-CCR5RwukWyIYeZ0GcIqs34NYCOBkT2+OLO0M5FegSUQ0B2UcPnPOSj983+I6ZYDy
-9MCbJRXBhsGCFMPno3kfA5Ttaa2O/3iZwU7zanBjebeGcIbSCWDtKAXLx+cJfyyJ
-JjAQ6irwOwr1Uyrum3JGJ9vA6flmHHf8YRmeT9A3j7UkDMjWC04+SeYCYlk3jJGP
-tXJBUjKiijFc4PGiS/jikokBIgQQAQIADAUCQe6/8wUDABJ1AAAKCRCXELibylet
-fLDDB/99+7DGQsYCwNMAgmmgsajK7Z+vz0s9cyZiLM3pQGdETqsGI6P4wC/eBGvv
-r9QDzdPsEd+nffGD9gnqoTDN1NvykMip+pT1f4p1W69tRt2N/ibrAhaWgZLxVKh8
-XcKfHSjhWbuYg7S1qs2pUIHYsrDnCY9iwksFLHVv2DgiPvg7uoGx0acFsEwud5bg
-BweMrN4BAOqOpTCXAL0zj24iutCILWywKs5o85NoMTEPiyqoM+n0a4bphpdfGBKO
-7je8kJgy2XYrVyVzzewytNNE9mlBQRHBa5FNWEy4dQKoOtlXST/9YvOxZaAt9yIW
-Si2YETUgz/xvYgOBPq2E39iywIRJiQEiBBABAgAMBQJCAI0CBQMAEnUAAAoJEJcQ
-uJvKV618MmgH/03yS301RRPye1+aYDdSgccfZ+EdoAP+uZdXJuHVmBL5cdhBIcpF
-Ryg4ACXiyLx7Q4ztsBEOB780CXswEhT0uTEyKSH2DaTQIyn8Ns/dd6ypcAU1+5Lk
-gxUSMclzX+cSUQwuITuhZ14gQ8Dr7TLLcx7OpyLsKd4wBN8wW2KA7Fgp0FY5h9Ho
-wvf+DUZRtLckMvXYkMNjO5U+Znb1My5/7y/KH+OTIJOf03J4O5m6+XyR42jUizp8
-UdRceXsSvZM3mskyGyv8xfMV4VsAQ6/CPPeoZWu7UY1OFIywTpfMX7s/hEE2XeJW
-s/dOVJYrZ7HZDe8SKfqJuDs84wNsdVKzSBaJASIEEAECAAwFAkISWS8FAwASdQAA
-CgkQlxC4m8pXrXzNGAgAhr8EN9rSNeldhN6+qCyzP2L/f9jd7GLMcuDzGNtzpkzo
-q/WgVWs/SBe2uZ+uLNXdfcDG+I64fMdaji9UDqdGIybH/l0Ea2AfaLdR2/LYK2th
-kfNWmySvN9sgwWaq8RPEKchRg0AsK1OKXjLByDPlB+vA81ObcjjhefKii3XVDSYp
-2HoRXfSZ/Wc0/5JQKXPV5zdZBqZ6DAlWn1G+sSdXCZYR/X8s+m8VmT1qx9efWcnR
-4jNfwQsgIbUWY1Fo7/tXGJ4nKywAk4LWZmM1dUkQyI3AZHNyPSXsbJoksAoQRFVT
-ESn7PkUPsjOBMp0m3Uh0OUsUF5MgahqEtHQldXVEA4kBIgQQAQIADAUCQhapzAUD
-ABJ1AAAKCRCXELibyletfEk6B/96IIV790+6BKmKPY0k8KJ+d8kUN2zo8sA5nIUe
-0X/lEsIhVCIgjwEcPp/2Q3Rx+EV8abqHHjG2VgF4x7wJtKIabQZW/OQIS1snZe5j
-66OTJbPPtLvFImdGQuy5uHHog/3ZaNO5EmqchaTsZPPhX1xbhXJlQuP4EXJ9+s1u
-14LPaoZBHU/cgqYs+lOMeOHAjx282lX6X170x50PIubSz0B2VvO3rN1u+CNuLMTi
-Qz+tv5vePNEtCmR3Hj50UnxkUe6r46fzA2Wb0YGNHbfbUY9nbQ10B7WUw6OaB9fT
-j4nO+rS0ocw8txEziJXAeBOeIrSOB+/IcLsSKCjpj2J9JGoEiQEiBBABAgAMBQJC
-KYicBQMAEnUAAAoJEJcQuJvKV618ioAH/i0A1iVSAMZSakBcBR+bP8iT3uLMoEkY
-zWSlb+R7q33LQwWXgjix9Y/GyqFwCsYHDkFXBm/fYsErhRVDN6PLMWs7VAli8E9B
-uOa68VDI+x4rVBUYvZ/KGP/7OavdKY3D/ZERSaP9m3wdEs9cdeSPAqnBhMtC8UkS
-huUWUYwbRN5Ib96Gzwl3R0Z3WUKloGK5vbMchleXUXUUclAeFe5lJCwX2n24KCQJ
-UWE2n9ervQHL9UOJoRedTUtOWPvJTTp+moy70NJJGgXstzcFHhuDxH4Y/gqj5hzp
-UXJANq4rmkohkiNdBgV+l8RBFqNJ6yitRnwrYrIj0h4his/RY6cGwleJASIEEAEC
-AAwFAkI9SRUFAwASdQAACgkQlxC4m8pXrXy7vwgAylGsb+kwxfkl/fxTDL9Hlcwl
-Ek1NnXNmfbHryHh6iSg7PUvmrCFQ2ee+IUZcf1JR8BALI9gb093fFhWB7AxD+JTi
-Lh/9AMuYbHe5fhDj7v1V+Nnu7WTP6z4Zqzt0UHDqdpmpy+uq1Q8Cg9k+21UxQ9s7
-mW7QBl8d5SOtb2XGiwl/HSUTv2tR572DYyGc9i+K9C/hIRtpnpJSaZjV5ZT6I3Z5
-XA72cfCCVU/FeeX7p/v6FqSEbr9/YUxbLt4eYZl6GRNDean1G9NIcZf0Ihi1fvuf
-E8/zKNKUaf+u00TmEMi39troiRrEoziasITG9e7L3m9NgQJsxR0awR+N1DYcRIkB
-IgQQAQIADAUCQk/AGQUDABJ1AAAKCRCXELibyletfMJBB/942fArMQnRknXJZw46
-Zhz/JTErKo1O1zCC1fzKgR8y+n7X8iEQsgWCoeFljpoxczzYixL98TSHXCtrXNAE
-QIkIo78aufJpEgjEzX1Tgirn3RLteIg3kdzUwX5M9ZganWS+1VgzmycQs9UYN+tY
-iTz3mN5bpJlK9Au8KjsNGRTMzR1pLUjc5eZwGWRN1HAJECqtsD0w0HYlHvGY6yfk
-T9MVpH71BnK9pOorpJ+hTGD0Gw2O1k+pK8UBE1y9MvGK3K+WoTFihUbuT+aqf0KU
-5QwPKrwvQe4yUrk4cpYjWIPBjhDkIll5yr19a199C3gsFoXcH8mbmh5AbKkj210d
-PgXTiQEiBBABAgAMBQJCYiZaBQMAEnUAAAoJEJcQuJvKV618WboIAKLLpzY5c9yV
-g/oOdwlb9tuQtdUt04R0t1wYeMYxed6Brx4/26fpXHtxUh1JfsJtzBpVMHBxnas0
-qWfZHywPyeDsXpWeSOYjGfAyGaN392e0ZtkPxWIx1KPaqnO3IVkg/D145De1A/m8
-Pd6OO/97ngFHg7C32EuS3YEfWaEcCo23qy/AvoRVbVmqXUJVC4aRDqg9rIl7juMF
-C7oysjjMv7Qi+yLS7BNSRmO5x637Z4AZeJ0p48npd4HKbJKMXqmUBSLFhzUCMA0o
-BeWxYld+sIHNW58tgkJuFfXQhXyY6dh4foh7roPqhIvI5lyxq0ZJoW76UrC0A5jI
-t/qGskU5ym6JASIEEAECAAwFAkJizvsFAwASdQAACgkQlxC4m8pXrXxG0AgAk6hi
-/JhLlElgbL3lL5KNOyAFssCcVwwrNufMHstpPJTFft1I4EGJpUdZLr8wUIvgxI8I
-bZDEWn/J+B7uqFw+4iAdi82rTVZDqv62usotnXs0y5GPsPbWyICyDrmwSYeBnL7y
-pDmXYu/Bf+H0Nx2ZCsw0zSIpHhPRc9Lv7q/ZJsGsxtF9FDHRheRf1wuZHhp5Vvo7
-KjSbl/KdezEOldULsZrQmTf1rTanrZnaYu+MSiL6A14+e9HG1OgykjvS/oQoefpy
-gdkbvkBKirxMr8hPE2kUPc57FpQUcon5m3TcMh72NE5g9INPXlDv2j0yIKVaco89
-suxIAF86AV0D+xMYxYkBIgQQAQIADAUCQnU/cwUDABJ1AAAKCRCXELibyletfK+H
-B/41TRknBVogdw63K9HNZkemH94eRXb1Y8bvw7F42oH0PTpcJOECphlBTzV22RnB
-zH7zUt7oGM8FmuTCKbTds31B8Io1wSnp+7hm+2oLs5l7YhhrkjpBaVOisPu3zvwf
-PS8Oo2qNBHp2TRfdWeP/dKlN6Pg64tzl49PJemJnhCi/Nse+zHr7Hm10jZAvQ7Sr
-+JgJ/p/mhX1+L4xYqq2gqHzu0g5V/gOpFFyy8zsir5TyZViqSrsFtx+9usPAc2Kh
-KqUXp2n58jXCW6wDKLy9L9plxshG2sp4RJ2cpi/+vz+LyZnoAAEuU/H5OxXC3izI
-hn0fIyv6cVbmkoQkCqNl0VWliQEiBBABAgAMBQJChxEXBQMAEnUAAAoJEJcQuJvK
-V618x+sH/3cplqFvGUxbm1oFFZNmp1aXy5im5m5cytJL9IYaiJtKuBPyAzUMzFLg
-jcF6LDDhCZ/bPitecpjIQm2iNBj4ELqNot/UJdgRbfikN70dvuDWXeegTdhEPAXR
-pSYoR5YDfeJeJT4ldxB2tO69tT+KrQZUaAZUceJjwsoZjXJa9aBWp1ecK3RRKVrl
-CKqtApqZqgYk/RW09vogrvIQEQqjzclkIp0SQ/LxwTILgoy/bIMJZH2jXGgmQyXm
-a/VT8GaNp9ioQ19nkORlHJqTrV5R+AeTmptGfJjGYZPhMO0wPU8I3aOtL5js7+PX
-sqKc3+bqVXVzVObIG+x3aamHo+DkW9iJASIEEAECAAwFAkKJtlIFAwASdQAACgkQ
-lxC4m8pXrXzNBgf/fJAoz8n7mRXeiBlSF0XFqpqrIKe0Hsl2nrSlRbUeEKMPLXOU
-oFCuE73L5SBvT0u6xrxFpEVegPfeJ3AKlcTZYulA5LJSMsKTwcDSwDV6FjE5wEmg
-1WwJ1E6Hw9p9MdUB0TIdrQx46yirymB+J2gLGnEMnjaw+3oVRCK/N61t6+3owX/3
-c6pN5FZfM5NgE+oN6EKTXE/teHm9B0OUSmq/xb+Rwt+xvMGLOuoh9bhA+nP5GvQp
-xKPBeYbz+17dSV7IMBbWuIHCrKsgUP8ERScHcCYY0xjFLn2sfWExIiIHog5OGiob
-9Wq0dwgQ23/2uX/zTgb3eqjWFmbqDKez9M+cYokBIgQQAQIADAUCQpuB+gUDABJ1
-AAAKCRCXELibyletfLzGB/9U2WMBn/SJpQA32jrNYOVsczX8dvgzJUA3dBJpOjBB
-nP80ikAyEkzVcHa1xfoq2hptEdzwmaSYfYRFHb4oT6V3SvjwNYtyDBkaTqxdKW+P
-Vy04fj0aGJL/cxLyMlYUybNo+cGxHfVwJWJA4VF/N/IPyx1VLeqTQnA7Brl89/ji
-9VkRXtfLMF+WfY07XuAxQEvP3pShDlHzGMhPmkUQmdHlnBRgtLIZZDMZhK6cxVln
-qudqR99MyDg7yq26ESjybrtSxCypF9xpa6iVnis3cMKi3S5Vp98oaH2Haof0qNJi
-p0bd5GKe39xyzlzyS2xp1YpqELqy0Up9cADkc5nKsTqhiQEiBBABAgAMBQJCnNMK
-BQMAEnUAAAoJEJcQuJvKV618RREH/jMt5I8jSpnlaHxe+B8eJA1Kl/kG77Op4s8x
-6BljyqiXXDHNULILfBmC22mvEpTvOyxiWh8E6olsFTo9epgjh8coYYtxyBXKRY6B
-y6F0Z16BG2vmByhkySc22GVJNEeZ8p849zonBSG50uHnttjAMlAS2duapzhhhI61
-RQ+4eF/TtPKghZGu7eGXqWR8ztVNaUNkvhu3nZneyU+OEZKn7LM0FY2oO5ZqnUGV
-O9/HtRmLUluqrmsTfeMJxMa97n/+zIFKqx7VDIwA8SV0qMbnFw929wtKTG+Av4jU
-9Mi+WjudyC/DYQM6Z2aGj6Jzq9O8yG/vzZRW5UQ7UB0o0RWKOVmJASIEEAECAAwF
-AkKv7KcFAwASdQAACgkQlxC4m8pXrXySQQf/Vf48FIUYYVflloKQj/rAMyEt71o/
-qEEt9YfkhPg+vpoe+EWKgGatxpc82mHf02u/Q66kpv2jFvrN/boVG7g2p89f8K0V
-+UYT5b5RREu8z+DaNPSwb3VCCZ6eXIjPyfRvP6GVBtbWOIZHSgHAWYuKGp0mVv42
-SVLYRx94+gp6AnnljQTjkYA/u7hDYUU/gqvUQlQL3QPgjL3iDGlkxC5Nwv/NMnAI
-8Z7wp/Ol8++77yUC+OhsDhP+9hxXP/BzVhSWzXFlLBPIYmJ82Rnc81YGo5l/4QuB
-noIjuDMCb/fydMMRpc+L/bgS0Cakqm0G0Ovi7h29kbJqlDv6s31t7fSjz4kBIgQQ
-AQIADAUCQrSPawUDABJ1AAAKCRCXELibyletfE6iCACsegwbn+aU+gmv3qYxHafd
-5coPwq20CnY7Db6iDeCytcN+IoqLX7v6fSUQgW1lsQDZaT4c638Z8I77OIGdSGA9
-ChuDk1U9pe36caHAHhDXkrzHv7w3tDrRnpEj0GJyo+OmPz018OFkzdpI9Tk775Xk
-jYlxJooKEnTbggo/B4fKclSoUU4ADBvTt0P45E7tWlr9uqvN87yW/YGy+O6aDxM8
-Eq/8vrgZr7mYyE1M3ZINvaFg5dhPWmOqxOUqSt/SORg/S/w++uOTPeu9qf+yGg+B
-jYNUJ9hIu7a35ruE5e3asQMPEMup8Iurckixorh1FKwRtcwAqjegDDxn5dPTMuQc
-iQEiBBABAgAMBQJCyQdJBQMAEnUAAAoJEJcQuJvKV618OOYH/j96LP1Mvdc2hqkE
-fnsuACOjJ+onzupaacez0jgXjmoRKqKLuBLCPmWModmzz0zR4uYWQJNBEGvZRBQL
-yIip3gTa6xs/Ak3bI4keX8q9W9uiy9pzu7D3hM1asGFOruwNtgwxst7ppj9NUkN7
-SyRgR4qHFUm0YvY3ZvfHA78u2zLK00D64rmG8VNddrymP1TASYq0TFNZhXSUyfIQ
-xFk4M4axGB9KfnYNIFUJjai1ZHw1xYVm2V3gsRcHBr8UC/MsuZNCfmzH8uZN/pWX
-icFYqNwj/Nmp5Iio111gBNbqui0FzkeMseM9K7j5iHd4SbNykTAb1TQ3goPkdQuM
-m6TPTXeJASIEEAECAAwFAkLQ+IQFAwASdQAACgkQlxC4m8pXrXzBfQgAglVzFEla
-U5BD91ZfcU8pq/pj96VnHoruSKS17Y1reHt/Fot5qG2ocYU7FQv7ybF649sWLc13
-mFqNn9n01fy5FgaDguu/XeR+IDyXQbduplBZC0bpU4RLcPxr+esjNyckQR0TlRr9
-xQv6AbJ0BPr7sFgle5ntZTi43KnHOaW3SmaZPx2VST29KoHPzJj+5PrT50WavQHv
-55kUGGJVF0/J47pSMH8HJmTld9O/luFMhg+ih1Sya7i/jNYIgFe4XxPAzNKPweyw
-VobvpX5n/ohZTjctmELz7+CBQn2DKrpCr43TXqkR9Gnr9nrUOAOIctg6dpaN6VG+
-N4+l0winEbGQo4kBIgQQAQIADAUCQtGddgUDABJ1AAAKCRCXELibyletfNnhCACa
-FcXOPg3JBbBGeUd7fIc0hHSNZO7yi2h2uvEPoIGfRZb82NyoXErWpce/N+h0a+Yv
-8xiE35k3l1ZtfuFlwcdjCa9hk+yZ8hUqxo+e8AUGa675JZNcm366PylUW3iPmQMg
-d+Bmi9DToXAXkWjq/lDUNRC0mvDdYPC5PyQcfm7350VOP6tb33VjLA6IYPwIiPvF
-mMlXujFV0Y85KPugpcYLrInNelxcJYwQu0YMsfUNEMa2MQA0TOSiB4NzsjVk3Tbn
-r7OQXhbukVRug8nkNi3jYtGo+mI1suq3aaToneM8Y1JYWw2PltEF098pLHH/ee0h
-AmyC/r6MBFmNIyzNHQH3iQEiBBABAgAMBQJC42W7BQMAEnUAAAoJEJcQuJvKV618
-ZjkIAJzDKDIwUWwKRNL8pWYMnbKDGnF1Avw9U2+5VpodhismlHJxeRBel4ZyL1EY
-u+60V0CliJB4I4wxh9UULVnjbH/fTVf/o+QJ6hfcZAY/IXIwSVzz7FJpe5V0jeXz
-EXPwvILAGQnZwH3LEJ/lza2BR5e4FvSKGugmfdXUlSuUG192SCFAn8tpAd8PXrwi
-3aDhv3REsL5lxF9nfRtOPwMxIwiqAh8XgjEgJ3gbbdBFkfWf7Q4lziE/1rDUs1W8
-5OTNleII/eK9fdWAsma5qQqSdsDuR9/eey5XCMIhv/lovIYXzZjGjUFdJLMix/uO
-rlvG/cNIpy488x+yCbDSeTrM8OqJASIEEAECAAwFAkLspEwFAwASdQAACgkQlxC4
-m8pXrXwx0wf/f6lej0+Xwqppwfdxiok/2dno11mWeUCDhCX6j6Vb5lxLemBwQCBS
-u53V9s6wcOT3NzkwGbl9Rowasihcg/pC5mg1o4I/mMrU63yto3iekK+0vneubm7j
-Zw9dY7aLzFdQm1SLnX2zJiC8Fv0zAJQWuiS0Bsj6MZl8+in57BGUi0E+n9Q4+qnn
-PVS8UBO8f+d3xlsMnOSf8IECCN4QqkI6d/RuKszBA40UzQ9JoZVHV3Kxoms6yJHc
-DI24xUkVqmo5E9qRdLt+mRblsFcfQqZbfc2v1kYI6+0fvkF3cFNOlC24c2ctN80V
-eMr63neRBiFSltaTCBT4Rh5Wu/jLTBL82YkBIgQQAQIADAUCQu1LBQUDABJ1AAAK
-CRCXELibyletfPrIB/9NEKKNoNfA8dscM1MN9hlITxbB2QDgm5jj1Cv/3lskBGUw
-GoStC8szJv8etlIxHnKafGglyZXdQycOIodccKcieZigsJA7ap5PdgAQUG6FRQRb
-tt7+hWx7FYEPDJsYca5FYEu+7iWHtRNu/lNjSJLmDbMTrmwP2BOglqlt2CktWWSU
-jJMx35OkO4G7TBO85EKnepm7MTtVdPr7WxtSOnsBlWOKk5a5mDSRIrofhBumhjwj
-NgGS6pAyo5MxJspCH/tUEocVMSDeHRgngD9GbfMC+FvssbgJI2barzvkHvuXBSla
-bf8+IF5WOxLgBE7SmeBAcC3nphEUm0ZE/qyTXYVqiQEiBBABAgAMBQJDBw4vBQMA
-EnUAAAoJEJcQuJvKV618IYwH/3d5XhOyfHHtqm8gceIBiy3WU/TYsYfpKBTYDkYa
-IYqOxI1DVIIIsDvoyUvLiEc+0mvnyKGCyZGFOYXxlSGGwyoDz3ABns4eEp477BqF
-xCN291aP5f8GdHOqH5jm7Wv/OTwajuYt+KCtuqQZo89070hmo6JN/+okI81Wa2uu
-ZDNnlxjLYtG6NVrTzg3thvouohzH5WHMuhWahF0sc5tRhbG0NBoF57zNEOL5P13G
-Es6skH1evhqJ2Yq4yF7qtITrkuAPvNYoTRrsl2S3QbWzgoE8cp3oVj2m5OZ5KV6n
-aTdKmuKbWmDNoh1F6cMZJ7OD+oZW1WpSWhrS/j/uNNUWiZeJASIEEAECAAwFAkMI
-YnoFAwASdQAACgkQlxC4m8pXrXyB4wf+L7SbCUfqQJB04bM5e5cgL8r0/wOqAJsB
-2XZssSrgSZrxJrZbZuNPdjemexR0vyA0ZaIKb7jykJnnMgRZxuHYAPcctw938BQ8
-LjYMfuvAmv4Sfs937j7x7IsoEff4uIl+ZC3000i2bERXgUbiZULx+PFdg8cdAB6o
-ZUbs8Jf9fg6/qP8sz/Wo/DhHW9CW6sSsccVfORVTiHTSGA71VYR2R+WFBi9EVl++
-1puu9yYz/dWc0m33Fl2R+ehiSV0xiSQnHSpSYMUdqViPsa833z7QTvvzh/9sWNHm
-28TRTdHLEXYQtKTcCeRQl3Tul+Ch5cU8WUqPN9DIRk1QNAro4yp9rYkBIgQQAQIA
-DAUCQxBNOgUDABJ1AAAKCRCXELibyletfEYKB/9GIKfaAtg6rYVhnruE0JT+c/zA
-M0ncuMiTSDOr/WxPE6ABpj1wAyrVbyTpfC75jyi7dLdUkzjaj6A5URtIurl4hlra
-oX6yVtx/VIFlBQG9Spuf9a4va/frDAF9sxorascozjvYD8F3o/5lHQ06ZsWCENI4
-CO9zSEVV/E+Jj1njto9fl4HPF4IT37xCaNoi5rby9tnaWktEBVqn22o3TULQdZet
-SYEfG6sF14MOMXfkfkMoV954tqVw7as5A3F5bDiCsNQ1eG4g2Zytw6Cl0NSQTXOs
-gZg45uam2ZohiCV+FuItaj/oETzdZI2BvJV7DYTNR5SNKlzoxhfT4AAiZc6niQEi
-BBABAgAMBQJDEPMBBQMAEnUAAAoJEJcQuJvKV6184vsH/03ofz2nVb2a2f2Wy35R
-k83tsUOeGbbxwOfV+zxOIeNhtsdRdMB9Ij61R9EUSAXQdcYDb1LWTXOS52FdMI3E
-UCax7/JY/rE25vwHn4nkqtvATLoTclw+geoRfDq9E3fqmJkdd5lsCsvbvajodQa8
-8hQQ9h3hprEy3axQNWdTg2XvszOJ1TVe/dOIzi8NIGpHSC8sl+8513Kc8u/14TSo
-Om9VceuLfmrjd8yw0qfbYCytkLPxLT96DcQpE1ARiDe7kd3g2Fe86zCviHrsA6Pk
-dgRPp++evAL7AAbTodXXWexST/b7hkHlT2P4XLKvjrThAUYE6Z+TEYsFiomSb/pL
-zWGJASIEEAECAAwFAkMSQ9cFAwASdQAACgkQlxC4m8pXrXzb2QgAq8v2+SYhN5YN
-cWApllLkWzQezrsZ8x7CJ2fqrvpVsQzJulyo5RHoz3DmiYUr7+7/IcZEQFc9BuhC
-fOI+Emu26QoQgqHH36bzgAfOgyVUjQW9PqCsBWNXtgl16dU8p8TeCD6+EPktY7CK
-cXwBTRQVrWlCuKOMwkCDILe+hcNCkJzjLq8I7n3sJulk5ti75Yz09B0zZTDX74zS
-lleh55rj6Mff1Be/zkTucWqv3oHKUwVHylXgkgiyW1J0GHU6cky2sPjh4GvovvBw
-V+4uHlJ//WARK6Fmd6avjpByvAMU8lxiRcQrTQrFSEFzBOkMhtfFiGVXg0hTLuwf
-3LEthKf++IkBIgQQAQIADAUCQxRCLQUDABJ1AAAKCRCXELibyletfIKgB/0fuFUy
-r6qnJD/XvAtnBvEf3qCDa82Gs03wqZaEPTrUqWmX9b15yd1HNyby4c3/x5U7Fzn3
-QN5LDQsU6pT02LfLaPSsGUQu5DGm/j9g2tEfOSfrvNssZuIFCx7BXXih7vrkXX9H
-SHVWyJYsJICECKOkCtEv+eOAIXpSx8FHdPq9qSQpJGkbg5V1Zm3JfqvwdwP3ztnM
-GBFDhEBy8EaG9cniFvh9IdOeifvCB924ZIo5XPgzx+nGgAbCjmta+Ab1L3m4vyIv
-CXept3AJOETuBuy88gQ3+50d8MnYvtn7wqCUfHF0DO9TZpvqREqgKJ/p8d8NXVh1
-N0lV33N/u428pR66iQIcBBMBAgAGBQJCdz8TAAoJEAgUGcMLQ3qJUgoP+QG34II5
-UiH9I+e/ZOv7MleAtJWTopGFm/wlt5l4e0D9VvaZJVFGa4QBxybX1R0aJBYn17lJ
-I57bULrYPrGb3Jir2/Wu0iI8RqaJRhJCkd+Gr8t0F4clDTUjQpf+/bKhy6Ax8Rd/
-DuDYNUdX5EUPVorjRMXJicQ9hYHMT5vQYtI83yC7fFKF6Et6nckCX79dXtFNZpsM
-2apSDsw6JPjyUMqjZ0+MBibW4VKjM0Ac6PxsjvH8JCYgo5AW7io/qdF9OvqE6JQ8
-R7cKr72cXQi8JAlCM56HcjOwAebpWwSE40S/LzP5KB3f1KZQLxlrJlN5X2kcGh5C
-CSYJbB95qa1JOP/5ZCk4Jf5s2K5yqO1yTsEgpMX6kYQjvfSbLZlpCR3ZV6we54PY
-HXJCdW/Pg0rCAVjTiKPohjpinaw3hM/rPoynUfGB7puCNBLv9LTe9NL/Nwq8Tu3d
-rR/cTUd+JwmZJdCkGb5F/vT4X4sGSaWMjzs9JTF16JVOZg+BG+xftBAQWISKegw+
-BtJNcS8oNhYh2PKLm/S7X4eaj2h/NJ3c4BZ+qG3qyedQ+VbNvi1HlA1xyHjfoShQ
-JSfL9XxCjbJyvl4BZ0/Jt/+pqRwHOmlSaIGPi0cTd2qfWvnuoMXDSOUYovZ7iFsu
-vFOauBpI7HY6uelPpae1Vkex7CxQ+HBYWMi8iQIcBBMBAgAGBQJCdz8TAAoJEFA6
-oBJjVJ+OUgoP/0qY/dla4C4S6ItcbViz7ptrjmos87/aCLFTfGqw8Z+FnfO65ntD
-/GHsJNW1YV2sdQC8rwPGBWSZ4r6S0F8GSfWim/QIDU1Ddzb3U4TSd6EMGn8QN2bI
-sFJcNhIUN4Rw+hAP3LIvJySFbLaX+PYH4a28LpkmJ2QOEpWK5Rp3yNJXCd9p33OQ
-8+5WhiabgEHDk0yZrCERYfMVyjhOYQGIHrFS7w5kLkgLP5cOQz55m+0Pm0hs2+sr
-nmQnfM/vMWr+K6p3uFQd/DrAbLdjOQb7hrC8VCbadI8XENbBMETCXPJVLuGh71CJ
-HQQX8+K/4KI9xlphJUxDqCaufn6u1gfh31HDcoN8rz5rz5huN94yNDL1Sns+aPqG
-uKPfpYJ/d9OjrXxiP9aow6lR/Khmty5Qlv+3X6WSM8w02KM66+IKHi8SmMkZ7DqY
-5TXs3MeYk1xtNdc2tu9VI0mhO0UiI+QOREuD0T2LUun2FiF71HjJo4b76TWouSFx
-g5bzNyJROdmHPLXozfJjPTED77CpexYHGnmmfTDTkAxeYNxZJqMx3IpZXyc9eFHc
-tsD3P2kLTk6xcqRiWNyA5TRWEdy27f2oBR3snRVRJiudBZ4fDGlF11nEuZsCoM3+
-SOUTqnezUzLExIfaCE3eyLHYvsjdpXiOW1xXLw3QlfHbm25awj0mqT8utB1NaWNo
-YWVsIFZvZ3QgPG12b0BkZWJpYW4ub3JnPohWBBMRAgAWBQI5PCLgBAsKBAMDFQMC
-AxYCAQIXgAAKCRCWJIPhVmLHNLTaAJ9hNOzeiwjWjFkzp871bkNEaH/ffwCeKkqB
-Xm+MgNn8x4jeJSAsmLnkV8aIRgQQEQIABgUCOcsvhQAKCRC/4SBlayFImgKGAJ0R
-sxryx9cxnBVh8/BWFyc9G++5iQCgnK7Mse4x4xwl9l+n2sIqj13yR2iIRgQQEQIA
-BgUCOczgIAAKCRDeeq9ulMCcf7VfAKCr0J1iWCUOW6Z+p8nsWnECWzqsLACbBUfH
-+uddjfI5A1xPKyuKI8N/AmuIRgQQEQIABgUCOdJS5wAKCRApXKqUbOX7VK98AJ0c
-4J0ZJH8Yqf1pF5AM3b+wzkCqIgCfUVA+624Pfy5M5MDn6HAFff8W4o6IRgQQEQIA
-BgUCOdRMnwAKCRD4Xr9GJY2HgY2gAJ9yVFmle7azEVP/pAQK2oj9EWV+VwCgi6cl
-O2WCkFjrUwh1XxfI2/U4pdmIRgQQEQIABgUCOgHOJQAKCRAfxIHP7Q18+tGoAJwO
-znBmhHke4Slp1KRE7gutjkhmqACg1OApW5K1Fu2e2qck4UHUV13pa/CIRgQQEQIA
-BgUCOi4+1QAKCRDcE+VOq5tm/brwAJ9fEoTskIB3v0+sTgY+BFhK0IkvpQCgjsNB
-skt1HRw/7UOU4/U/Eo5dy1uIRgQQEQIABgUCO0BqFgAKCRDndeMk20Gzh2KSAKC/
-qjFreYn4n1oCEU9ohUuj10zRvACfeHSqn1KNnV+bZrCUIhIFdsVpfmmIRgQQEQIA
-BgUCO0BQugAKCRB5Fi829/aq2Tf1AKCXVuHAHaDkDcqZdIPXlATLxZ3LDQCfSC+f
-XSfUIw126OiSV7N92rBpeviIRgQQEQIABgUCO0CtYgAKCRApvl0iaP1Un1qZAJ9i
-Ls4oQ2crdZjeCGMMOXHN0hP+9QCeM3eCuH7umtinTWSGYAV3FC3hjxKIRgQQEQIA
-BgUCO0C46AAKCRCZyJB1G8TjK6lvAJwLu++3heukjbhtl9oni8/53a+uygCfeJAM
-67FQlN7osr33gA3HcmXcYYeIRgQQEQIABgUCO0CLjgAKCRBgMFsxwJ/TWp+CAKDD
-22lET5do9L6N36OvMD4bDBLISACfddEotCwBUYo0M5xoruT6LCmJfC2IRgQQEQIA
-BgUCO0CtkgAKCRBdK6s7rrzF6NFBAJ9KIE9LOBkQmemtNRA4xiVU0lxjVQCdGunX
-/dtC0QuTTVg05h3MlxkMzUqIRgQQEQIABgUCO0BKjgAKCRB88/WvKUmfYXuaAKCv
-1ASCe17B92/RwRrkY2NS+PN9VACeLXD1EqWz8I56LuTkLtDIO+8P5oeIRgQQEQIA
-BgUCO0XX5wAKCRBDVVPF4PnGNP/1AJ4/Ks+5i/cfsNy0cHTWBb8AV7PuNACfQMiJ
-zYFyi5oHTVU0ElFGSPeajtWIRgQQEQIABgUCO0FVbAAKCRDXWV03S3KWJaUqAKCA
-Lemjsa5yGGqCkvZMZGvrzBkTuACcD8C8YJneGq1utCDmla1VRZMRQLWIRgQQEQIA
-BgUCO0WfPQAKCRAGBpzylpRX8FN5AJ4h+rSDaTZRx1XZ8mhyzmAWE929iwCeK9MG
-jMJ9aiocfQC6/AOqHvdDQwyIRgQQEQIABgUCO0m8hgAKCRAOp1a1FEhD9ZThAKCa
-/cS1/y2fXr0fws5hVnjnYr8BNwCgjTnOekqzSKg7cSnkFnm4u2n76AWIRgQQEQIA
-BgUCO0bGaAAKCRDyD6wLe4NX5ckfAKDB+5OHEo0iXNEX1gtgEPZ9WVPgrQCff1uF
-zeZPc32qw3DSLcX4uJFIb4KIRgQQEQIABgUCOzHW1AAKCRCLmMiiG+b9JZceAKCf
-2r/8ldyhCZrANdts7jHUEflaZwCeOZjH/RywKe2pPBmKZ5jlDnxxFCKIRgQQEQIA
-BgUCO0sVfAAKCRDApMu5h5eFaczXAKCJVPLjpBnXtWvqvkJlcM4ZTRuKUgCeLJPs
-DB/LUSSZ80lSGhStDdyuKveIRgQQEQIABgUCO01jrQAKCRD+mh7DZIQ5MxBqAKCx
-hrkGd+lgjZFOxMPrKPXf6pAw7wCbBp7IE92Sakh9OHjL5Zfv8lS86SmIRgQQEQIA
-BgUCO08mDAAKCRBd4kmWWwNYonnGAJwIJqHLwkjbbvzN5iwyAWJqYN5LpwCgmam/
-autAJiLuOMi6ui/xhYFIGtWIRgQQEQIABgUCO1ImOQAKCRAk6Z8Q2z1E1L7RAJ0f
-f+syNhDlD5b1aOUCh/p0M2cqigCcDzqivgOibvcBiaOGDwQrWC/GRmyIRgQQEQIA
-BgUCO1K//gAKCRDx0szISXoXbRVmAJ94igioussKa6NqgW6gA9hNO4szpgCgwJhD
-4vw46Mgw56cxE9UmugJm1U6IRgQQEQIABgUCO2MZAgAKCRCPH9/JvOCUNlSnAJ9D
-6dCfCoSldhVXOAM16Rnf4yE/kwCfWNP9q0DMccuSmw4AWMMaQQQeVqWIRgQQEQIA
-BgUCO0W1GgAKCRC3NaZJ4LoEwYRLAJ4kU9W7+M7I3MI6+106Pj1Kavx12wCgmG0t
-/mDBa3UJEORfIJobrhkRdCCIRgQQEQIABgUCO0gJcQAKCRDckT2YXfAxZwU/AJ9C
-/aobCIQ84dFYYhXLgXfaC/bN4QCfSsQB5lgZfBw3KRXCSVpbYNShoGSIRgQQEQIA
-BgUCO170cwAKCRCl8nAoCRep5JhdAKCU/BtO9wenJl+CJwbzx/nmfboF9QCfWQRu
-kBcyw3eeHOdh1L60LBn9V8OIRgQQEQIABgUCPAZt9AAKCRBvq6u8NX0heJqgAJ0d
-1i5sQ44UwNSaGNyWJAW3HRAFmgCggL5clk3sVTL+BZ+HA6de5tskTzmIRgQQEQIA
-BgUCO/rdMQAKCRDvzgtgBCVtO2vxAJ91pytlW0Kb8xkgWLIgc9NyhuQDrwCeO5Yj
-5MzTFLEQEhs9F1JV49gZhsiJAJUDBRA8HlbLgAYufOTUfsEBAfVGBADRMwS9JPfa
-Qvnat5WC7WnHTo9t6EMGHnufsmzmVjvd0sW8uxEkcpYU0lKOXIi2yfW81o5uWnWe
-tfCjCoUbBFXzIdWNXm2iLNYgiGxYevLxNmbizkN/v/Vu5dqOHvMQjAqiZ0CHvOjL
-rWHF9Aql6Fvetz6ydVHflF0aqS+W26FalIhGBBARAgAGBQI7UsbgAAoJEDv2CcaL
-r829JPUAn2tRyTWNo/iZvsTePHFYEw0cdXQ2AKC8YzE3R66W31nL9dkIlDP9Wuvl
-UohGBBARAgAGBQI8HmtDAAoJEMN2qNrxvNtzumsAnjdJxYxss6ezKyN+NQzC8yjj
-exQjAJ9cpnxsKd0x3oYDkuGvUfvLSbw79ohGBBARAgAGBQI8zqZ3AAoJEGBSKFyo
-d9l4lEEAoMag4VemiVIw0pKQrKKP8UYMRKbgAJ9wD+UwVz30P+/Ah5dkLUR+1CAj
-74hGBBARAgAGBQI8GkFeAAoJEAK8QrdD4l0eM+AAn3Cc8Kh4Z12bD3V+GftCso+w
-xNSbAKCNp5uBjbmCggQrt2nwTQVXWZOMKYhGBBMRAgAGBQI9NyQjAAoJEBJouCi6
-/ojlbA8AoJOEW7XWMQ4YqNzI2xvefZ/Dt5EvAJ9e01m3VZohvmaDVRaBwnZCRji7
-zohGBBARAgAGBQI8/MBLAAoJEC9Lo+/3IcZDxs0AoPbZzzlZ9OlqjEJ3MIOd4jI+
-OGo3AJ9WGKN3HDpbjdVGS+RRGPneNeefa4kAdQMFEDvwSNplgXSeA6P39QEBpFAC
-/3yywJap02KDm0L8fbajdhPi6k6iWmY6MrQNeit/Gd0ILbyDFu02vrAygqJmAayg
-lsKFCZK9E4efJqmkqBy2mpJ48kdOlxnfC6j1yzmJrSJvN/OhkMK5OwGIMBk1URwd
-IohGBBARAgAGBQI8/1pCAAoJEOIIBVtLZtmRfb4Anj4AmRogOSt4KWhO1IcHsT09
-Zn59AJ9wjRBhA0sy8eQ75QqeC9+ziL8TpIhGBBARAgAGBQI8vIXvAAoJEPhZkLAk
-iutz+KgAnR7QSEEQZaEusbHFEUC0debIe0yeAJ0clR6cG7hB8w7BB3sDTdvEfg8L
-A4hGBBIRAgAGBQI9oYxwAAoJEI47c57dK8ydSWsAn3Qy50QcLfDICTvG+nGTlVbU
-6+FiAKC/5JAKdzsbffUw8CwD02jumwXoTYkBQAQTAQIAKgUCPo2zbyMaaHR0cDov
-L3d3dy5yYXRoLm9yZy9ncGdwb2xpY3kuaHRtbAAKCRC23LAszRpSuWEsB/97awvu
-rPD7UMQx19AsRWXZWZ3NIjr+s5OkhCS7yazcAjQqH7Tl/5wXBeo8SIeD2IUUGCoj
-5CcWmFPJhoaXyWho7+xJHGlnqgWUr24FS+WQSd0diN7hDyPgTLjwkJXj7ey4FBfa
-ExOvwhHMmc04VBH8N54xznQDk7F/W+RDQSHvNufNsSBZBAo6uFD1xG0SMnLf1A4+
-H7Z/BS0KSMGdqiBHGfpTxXVjDbREN8Gxqx3/bD8hoHmZYY4SvJNO6GgzdoLLxa1l
-bNJjCyvIK4qMEUtdPbdUM3GiJx8nF+VsLHdGp57lCywWd/moONbkrBKS0zpxRK4v
-/k2qDeH70pSm2vL1iEYEExECAAYFAj6RgcwACgkQCF8pGcJq9OsVoQCfRw5nLhcw
-dDSH0WAMuqfSqwuWUjYAn2jm7ayWUjwsAjkTTSUzXsrgv0lpiGoEExECACoFAj6N
-spsjGmh0dHA6Ly93d3cucmF0aC5vcmcvZ3BncG9saWN5Lmh0bWwACgkQqa23+K5O
-QlzBLwCePpLmUcM+pMoJY6cTW2DZBknzK2EAn2q9NY/w+NF8pMT3EsNGhHCx/LZS
-iEYEExECAAYFAj8P72cACgkQ01u8mbx9AgpKPQCgnKm/8rG+TISFryKJSXFtq5A9
-U/4AoI+ao5AUmUgTCF5psohHVmRTvUuFiEYEEBECAAYFAj8QVjQACgkQ1vr63ZUv
-P/8BIwCdGM0X8frOjVker85BKhnRyxMTbekAoMIRrR+p5sOKqfm70Ot5dAjwnQ4t
-iQEcBBMBAQAGBQI/EQZ9AAoJEEAGFQ5ACertw9YH+QEOp4w9bnew5MHd+xyP+kYB
-+4zhv/JLDa4b321ymKwaaMAUi6+/51+q9hNyKGGltfRMVI2YsTkBZK521pUe3XhA
-k98xQeuSsCuVOzkof/ZkIBWUpD5ePDZ4ROILvUECEnupfHGYgJet4hjsSnpabBhS
-zVsHTvT7wPYBWsoU6aXQdHAWHj1ff6ZmKdiHVMXJc7q7EgdkXlz1cytPe1Kr6HOM
-vtXIu1SndaJ6RHTkFHikrzc7h+GZD3UrBE2WwXadi4j8oU4jNOPmNcgfyFTvCTga
-2tziRHDwbyWjWfkSF/K0hXFZtUAA6yB4PkHam60O4HtuuvoHXX4QaqCRVRasc56I
-RgQTEQIABgUCPxArzAAKCRCzNNMIli/S3oXcAJ9ksHHvb+jOBvQHWbkQqKK2RNz2
-CQCgp6vhG1eeIQjGKs8mfGtIIFnjzZGIRgQTEQIABgUCPxET8AAKCRDhhSLXfHEr
-y6A7AJ43Lzy8p+Fjo85jGPAxKBOZxCOGdQCfWbE+kN98BXU20Kw/PTxwUUZI4bKJ
-ARwEEAECAAYFAj8RSk0ACgkQCen5CopyTkUSQAgAh6+H16NVts1N7dXWNfUeXVka
-SZ1YH+Ou1N/3VLooX6r/dnRfrFf299KGNE9gdYU4ZZbzlssVkWOjbpq9ZnT0EP0T
-zODxqYk6xwLNbESTmfV+acJwyadAlTeOkcavfmPFhFjMFdh8hvAztXSSzuH0kVPp
-2q4LlQcE3VAWQehH1dc0KAL38e2oJXT3Acze9coHxP5F+9qqY5+RBH2K9/Qg6RHE
-ZbSbWqyk1Kp/PBRrv7reGCrKu/cknaIaMrd14gDVDaDYZpabZ1olVjLD7Xq9u2zd
-IrNbDUBHuc0u+6lJDnGMxl9cKZpcXtwZW7q2m/AJZZ64JNdOzAOwoIG/Zs2mvYhG
-BBARAgAGBQI/EqKHAAoJENQ8swWV/so0iN8An1kR7GXBiuo/nG6a6g80Uj8sw7Fv
-AJwMPsjtifxWHhD7+oePOLFBcUKjFohGBBARAgAGBQI/ETgsAAoJEPVrJqOmOZ5z
-H4sAoJdwPuP9Ras8FbVz9vxo1phsylRQAJ4+z5P2k4okmmvOoETzxYw2rnKDCIhF
-BBMRAgAGBQI/EGY+AAoJEHgz7PG1REgVo7QAn0PO7mLyLm7dWrl+kFiMAKH22WQ+
-AJdBEPNiQXGzPeX+pb1DfOJxIrNBiEYEExECAAYFAj8RP+AACgkQ6iGZQSR3yvg8
-GACfU7XVDJLfngnMfPnajA88btxP5T0An2GLPaRZu7NsbuSYHj8J54VGP2IJiEYE
-ExECAAYFAj8RXPoACgkQGf7YPOK+o0EK0gCfSFI/qReuVBWFKj/H466DMjaA7MMA
-n0lyeEvft6EXZ4ePTkoxHsjro1L6iEYEExECAAYFAj8RpBYACgkQxcDFxyGNGNet
-eACfUGJ1KOWCkkcVQ/axNLnpLOZT1+0An0NSiXPDAy2RiOa0ftCbv7N9dAsiiEYE
-ExECAAYFAj8RwdMACgkQvpyGjQRgTrgitgCeJF0AAIagPvhV3irwWnVxqOfvf1IA
-njfjpvbkXgf6Lt8/pYJComNLsqeHiEYEExECAAYFAj8ShtkACgkQoJD705cZn8PC
-2wCdHRClEdK3fO2qBeWErf+3VABkRWQAnAm0jEAHmYKm0C4ZtqrhwpLgKLJviEYE
-ExECAAYFAj8SkwcACgkQVm02LO4Jd+iJzwCeMmT+RD2ly1uSt/TlbWj2I6uyIbMA
-nAyb4NNPW+1HAhGRCrnsILVds6J2iEYEExECAAYFAj8Sl20ACgkQj7mZcU7rMfHV
-DQCePuYB3ixGRuyeVtRrdIwxNsERyiMAoNeZ2lMAeoX1vDmXAdxq6Q6g/OgEiJwE
-EwECAAYFAj8TMjAACgkQtGuSO22KvnHhiwP+N1Jh8cmDM4NVOMnh+twEdc0quSJc
-ZprPBQzZuGz3uQUKXI+xWEBkE92elHgfVo8CaSqh0N+SB40e7CyoQ5cHhdPPAmKJ
-ZGiLhtliCmQI8W7xKJz3ysFPBJoVFEKaamOvsAUezTbnAcA92vkN33VW2Okw1+fx
-QsYuQ7C5hdEN2++IRgQQEQIABgUCPxNg4gAKCRCt7CzRGpU357YCAJ443K7yqC3V
-9MYierjg+bMQIIUFVgCdEXchjN7AuuaAwiUP86POJ7Mf9p+IRgQTEQIABgUCPxGl
-CgAKCRAoxvVrgXw1aC2RAJ9Wi969B0HxCRBmmJmKY/G35+hg6QCgp4WXj0dK0QQ/
-ttQ9VqMzLbiHsjuIRgQTEQIABgUCPxPyOgAKCRC5gsvVwOMfHa6TAJ9GOyWePty4
-D0HO/i5dInksffJWkQCdEbYRoo9jgPM98b2Arb18rHRsOSCIRgQTEQIABgUCPxP5
-DQAKCRC7xxTRnGfNluB8AJ91IPyLFvn1mfvuhEksgmAvopXEkQCdHEPhku6Nleua
-JEirIr0yE4DeBwyIRgQTEQIABgUCPxQabgAKCRCAdScAZahB7Q6SAJ9IF1epz2ii
-OCRtFDzB++fZJnA6fACgypQnQZn5yk0FObR0umx0c0mMJdCIRgQTEQIABgUCPxQk
-egAKCRBRrPatdb6Al4izAKCRvQHWhW5rsyVLurGSt42n9yqrKwCgwkaaASoIrT4N
-3Rduq3Jtsyp+D4mIRgQTEQIABgUCPxQqPgAKCRBsdheMoO2YLaoUAKDu17oP9Pi/
-VkH90yIR1l4dQ7GNhgCdFjt4MegFyREUjkerk6DpcYGWwmiIRgQSEQIABgUCPxQt
-mgAKCRA19mF8UTrv2fN0AJ95j2z4vBYZB+plZr9P6TjKRb23YgCeLUunT7ARJ8kk
-HxJmb2rBwIr5cNiIRgQSEQIABgUCPxURpQAKCRDVTq5LyZhwsaZSAJ46vwwEDZSI
-n7DMCzb43Aw6mO9i7gCgriGzSI3wbk4Fl03XhL6Yx7q6GWWIRgQSEQIABgUCPxUs
-7QAKCRCJzUshYHVZ5t0aAKCF9Kmbta/PbwadSy6Y2ZtiwO2xYACeJqljQ1knbV4r
-/GCyJmDn3pLV7/6IRgQTEQIABgUCPxZujAAKCRCELNt6RHeeGDlsAJwMigxlui5G
-XM65FVSclFapDQs1qwCggo5t0MrmM/D6bwKgIoG+5ZH1wO6IRgQSEQIABgUCPxV1
-LwAKCRB8IsOfgHrFOjObAJwK1SDOv5xMjksadx2cfoVRUHIycACbB3EDJA5Rqjm2
-zGtoOWvlKONPDCqIRgQSEQIABgUCPxUSZAAKCRC/QVlbc3KipaemAJ9ui7yZa1r1
-0VaSwYM4ACzek5JBAQCbBPmKwLUBrmtc67jmwd9OKODgjcmIRgQTEQIABgUCPxRl
-1AAKCRCUj9ag4Q9QLtrCAKDyDMh57YE3BSrDWLCIfH8Llae8OACgz+X7LZ6CADiU
-UAQMvsN0PYaMI1+IRgQTEQIABgUCPxRl4gAKCRC0deIHurWCKS1CAJ4h9C4Girnr
-Qf0Jt+LWaSRB6vMHbACg1Mt3M/XOvjQ3ByRNlaz5cMF1yzqIRgQTEQIABgUCPxVt
-RQAKCRC7VaR/yQHDPgwwAKDDo5Oczmfsy/K+rNhp0EdN8tTpYQCgyJyfezJ3lACl
-gkZe3KJSjcWvsI6IRgQTEQIABgUCPxZZiQAKCRDnyduv41bvwB61AJ9WP2XS6gBZ
-e8fgWb0oSNupfrL1TwCgvDsfeZ8+228+PuOBa9EmPqn4Z8yIRgQSEQIABgUCPxcI
-VgAKCRB3+BUzuw7ox3SyAJ9lEoZio+Jqvu7yDsMy0v2W9H8BrwCaAu226tR8QQgp
-efrzX7CFlqUp2oCIRgQTEQIABgUCPxZaFQAKCRD0tLDMeX6/q79tAJ95QA3Y7Vha
-p/yq3/sU6rGdWv1gHACdGOlr2jlePeNjyM8XP7m/aTyTA3aIRgQQEQIABgUCPxe0
-rgAKCRBGzFxj8xilarPqAJ9CVDPJRDwCTEzyxU/aXPUcD2IIQgCfUwWviRTpr4Sl
-hYQSLPInA8XRL3mIRgQTEQIABgUCPxfUbwAKCRBTtrgdwTzuBxZAAKChuDlCWIgR
-y0RLB43upNulVEMhPgCgy3nvJsoNNdGtApgalnD3PCtADC6JAQEEExECAMEFAj8W
-hgyGFIAAAAAAGgBjc2lnbmF0dXJlLW5vdGVzQHBlbmd1aW4uZGUiaHR0cDovL3d3
-dy5wZW5ndWluLmRlL35iYi9jb250YWN0L3BncC9zaWduaW5ncy9ub3Rlcy5FQTcx
-QjI5NjQ1OTc0RDhCMzQzRTgyMUU5NjI0ODNFMTU2NjJDNzM0LmFzYyIzGmh0dHA6
-Ly93d3cucGVuZ3Vpbi5kZS9+YmIvY29udGFjdC9wZ3AvcG9saWN5L3YxLjEvAAoJ
-EKseS2BGdWsetVoAoKC8/BexDahmSBm6ByFHjdnUNnqjAKCnraKOQoRD9mHRkhYL
-hs6Kb6B/e4kB1wQTAQIAwQUCPxaF+YYUgAAAAAAaAGNzaWduYXR1cmUtbm90ZXNA
-cGVuZ3Vpbi5kZSJodHRwOi8vd3d3LnBlbmd1aW4uZGUvfmJiL2NvbnRhY3QvcGdw
-L3NpZ25pbmdzL25vdGVzLkVBNzFCMjk2NDU5NzREOEIzNDNFODIxRTk2MjQ4M0Ux
-NTY2MkM3MzQuYXNjIjMaaHR0cDovL3d3dy5wZW5ndWluLmRlL35iYi9jb250YWN0
-L3BncC9wb2xpY3kvdjEuMS8ACgkQGaJoCYg4/ZQoyQgAp7zbUXdSJjC99c1U2Tf8
-fsZqyxty2Vq4MERWsogmj4WMJY7s1nNOl2ytrovMZ8lGVFHwMuFM/GqhxkcyaG60
-4TTsBZIsF+PFwYfzdN2wiW2/nfE7EoPxYUcCXTSatz5b0kGYrQotFjxbL71xaEDb
-fCzvvrtZcXNlM4BFYOo+Ad6YokzaRhE18eWnYCeqloJrkXnZuUj6g2CkdaKz8rO6
-QpdbSXHiOHNxM0DwuGE1KEVH6TlixkelWD7eWK/A7ozetrLgvfYR9xgwk5qfOi1Z
-zBurcWYqtXbsthXlv7kxDZYJK8w3h3hlvPGzjzplQP5kisaKmRQnmZT2hKo0sgyW
-3IhGBBMRAgAGBQI/F/CpAAoJEJEfSuaGoRjmasQAoKwxDSMg6qRd/67aBEtukTSq
-cMhGAKDsScrYaTKk2OPEx2nLKt856m7mb4icBBABAgAGBQI/FpAzAAoJEO9tgkHw
-gRld9YkEAL7rFxi/i3d0HRdrISimFvZdcQ+M17mzd82z+9L9qTxBDFJgrHjNrHD9
-zb4x5CehUwwEklQKGM9bRYgNfKZ3FfJs0DQ6TC8VN82cECVFfHSdKxtnR0Wu5wK+
-1Ru+517coWCmbMbWZ0xgtdZ7DXxOcS3DqgZ6Q1bKxgxR5LGTb1nniEYEEBECAAYF
-Aj8THygACgkQ0Bn175Anq4i/zgCeP7srpshWEkWMk+2g9SiFjTSCWYoAn0DVZWaB
-t4235TT2bJM40pbuxvJYiEYEEhECAAYFAj8Ye1oACgkQMwsDi2xjdG2clgCg8n0h
-KYgMIZF8K8N5xWXyMIGh71gAn0tPowccJ9wAe1JXX3slFWAVtVNTiEYEEhECAAYF
-Aj8YfiUACgkQsandgtyBSwkAfACfV/oO66wsFR0TDcsn09l4vPQn4gQAn2yuFdZj
-mb9CEGXQ7OwCz9nkJArSiEYEExECAAYFAj8X8GEACgkQVkEm8inxm9EzGwCfQpN/
-NEb25HY89WP32R57XbamlycAnjgGgMgU2/Wf0E3a+KRgWGqGs0STiEYEExECAAYF
-Aj8YShYACgkQGnR+RTDgudgElwCgvX2J3MJJHDzGQVnpX/j/vinbmKgAoIJDdRhp
-TimIOc3ohPI/hVn/wOTtiEYEEBECAAYFAj8YdP0ACgkQ9ijrk0dDIGw4qgCeOg2P
-pIXS1yy1NBGb1e+GNMfZIisAoNPZ0dwv0YkdwisRjHf6ipIQwyHJiEYEEhECAAYF
-Aj8ZK6AACgkQZd80wCtfheOo0QCggPdjSLfBSv2mCSUZZ4yggajC0NUAoJe31w53
-S53tMoOueJgPaH1n+EociEYEExECAAYFAj8ZlPQACgkQIexP3IStZ2zBqgCcCUIn
-qpy76RpB0CuQXtxe6LSV804An1cbSQKE9c13GiYUaWG1v0LoOnHwiEYEExECAAYF
-Aj8aZToACgkQzop515gBbccP9gCbBKji8iWm2/qOW6MGBRHWABi/sc0An3h3PFt7
-h9qTNd9cF8bUBYoGIiFYiEYEEhECAAYFAj8bkb0ACgkQ7A6vcTZ3gCU/RwCfQAy4
-8uTR25zCbmIBAK0JW55KNlUAn3ausauxgUdAfm6aohyxxrvD4JRliEYEEhECAAYF
-Aj8cKXEACgkQdNeA1787sd2ydwCgg8n8+hiDc4ACUTtW5ft8h0b3L+sAoJ3iaChz
-MUMxi1lpDxt8qLwmv7SwiEYEEBECAAYFAj8VydcACgkQKiV7d8Y3KNJj1wCfcYaG
-rDGwI+OUsEKF5kp/ibBmcJkAn3d/RszoziOGNaXR5ytxAMOuH4IpiEYEExECAAYF
-Aj8QIlIACgkQAtbtIeMsT0uIogCfT1x0S7HhrI22Jh2lykvyjdD+eDYAni0cZKJq
-nzFV33YW5shk6ni4RE4XiEYEEhECAAYFAj8ce70ACgkQC9tTsaLPijgiagCgibSt
-kJ6yGyXjT6k8MzrrSRjwr4EAmwZsvXWQz1xrlJThOSQOJo+giABRiEYEEhECAAYF
-Aj8c2hQACgkQyA90Wa3Cns05pgCfZQvXVii4ojLdEpCqPiGyPW0Nd4kAn10t1M/D
-cu+sXnSafvRV6BZhxcNyiEYEExECAAYFAj8VuYEACgkQS+8mJCLfQIevFQCeMqPN
-WbuTkCW2+OVb7g4Yn8sJ2b0An0atcvtqd6YjmKxIe3hL/3CD4FRbiEYEExECAAYF
-Aj8VuYkACgkQlWQfayU+WOOj8ACgsF3i6btoulVD/odjXoAKsw9+ybAAnjLpzn+L
-OKcgingkLfL4pQfDpZ2xiEYEExECAAYFAj8dgKEACgkQO7/Pd72LBQ3o0QCgjTPf
-auFWp+HBXlWMlFTaUDmPKMsAn2tMjHeRGzY5rcMI8pEcpMkzDm+YiEYEEhECAAYF
-Aj8eOrEACgkQzAGaxP8W1ujPCQCgi/ph5B+f43O3tMa+Vl2kSm/iwn0AoPBwaa4Z
-MUZNuV9zoGXTUWx+8tu7iEYEEhECAAYFAj8emTMACgkQNFDtUT/MKpDN9ACcDBVK
-HUdglwfB6r2rw/qo56x3u3UAn26NqtkbvIL1LjxmfuoUueIPsK0IiEYEExECAAYF
-Aj8e07AACgkQKO6zWj6NzMBOogCcCfGFTxfDqxI+KRIoZ8rF71e2RosAnjYgt5y6
-wU6gTMMin5Yjm9hzh62diEYEEhECAAYFAj8e2VIACgkQkryUdmOUJl5QzACaA3q2
-IMEuTN0CNnEy7DdElR1LCYIAoItw8HTShrWVG9yvnvFxMChDPMIRiEYEEBECAAYF
-Aj8fAcEACgkQKN2w/RnJtrpX5QCgzNwWHKaG9Ag3tA+Ac0KtQ31SiY8AnR/S5tYf
-Bde3E8kikmYvh291nKsTiEYEEhECAAYFAj8e79QACgkQGpBPiZwE9FZi/QCeMqew
-RvkzepVGeLQ3bN3I7pDDGBYAn2CFPcdZ71Hht0rac52TS3ukCv2LiEYEEhECAAYF
-Aj8gJ8kACgkQA+GMa4PlEQ/XWgCgg38xjA5L0D5WkZGKYVHYwjpbXt4AoIGFFJcw
-FNXNxap3dY8rH14ntilJiEYEEhECAAYFAj8hEqQACgkQpFNRmenyx0fhvgCgxOQK
-p6pPVcqmPN/mTRfGpWGSYHkAnR96kY7ho5LFcaajuqCTiSnQ1IkjiEYEExECAAYF
-Aj8hczsACgkQlJsl7AdEclJ2IACfWZTVuF6l9mLigt2qXNcuPbmGxVAAoK0RoV41
-Dkt9R2lIm6iqxrNRW0ESiEYEEhECAAYFAj8i7MEACgkQ+o43kJBROPQy6gCg+oEv
-MFJdqjRNGMfLj1EZCOPUInAAoNYkQNGvIW+hanA09lIxWK2bQExJiEYEEhECAAYF
-Aj8mwdMACgkQ9D5yZjzIjAmmpwCgp8sJU93M7CM7vsGpReoEAVmAJ9QAnjgfhStP
-wYEtrnWlDeWY6hA1kP+LiEYEEhECAAYFAj8jnYsACgkQGKDMjVcGpLQjNQCfQ1Vi
-vqwk+GGNSEaTkNZC8dUJn5UAoIojBb/gmfx/SGhg+ILsOm37Zm/ziEYEEhECAAYF
-Aj8jw/0ACgkQlE/Gp2pqC7ysoQCgjyv6JilmZ2fkk2mGktlZAMCGPcQAnjkvcY2J
-+e5S0pnWgTXPmY9G7dlsiEYEExECAAYFAj8b6w8ACgkQ2A7zWou1J69fwQCffecR
-nl2OKb0xyan4c34SAiXW7tkAnjjlXUeZ1phjKkwCOxSGpzVL2dg2iEYEExECAAYF
-Aj8nsWsACgkQ5ihPJ4ZiSrvw6wCfSqPnCQUf0RCBxTHwNeXoHZLNsgoAn0mmdV02
-e4GTUkP6hcahi8uktaz4iEYEEBECAAYFAj8n2R0ACgkQbyOLwk/aWgz6EACeP7lN
-/AdK/F47D/RLEj0iFa3hoUcAnitXQcHBCa2V7nsdLGgBu+0RFrTFiEYEEhECAAYF
-Aj8n3nwACgkQn88szT8+ZCYVUQCeI/GFVLQVfpjbILxq3QzePIvUd54An3yCiNfm
-ou1ZfGQXR9ut54CFWGZniEYEExECAAYFAj8oGAIACgkQBDI26xBzGXcQUwCeIPT4
-RnjFVbpIu9/yB90/4XxGSJ8An1Q12NxzY3nguYjjeFZwPSfhV9zliI0EExECAE0F
-Aj8o7UxGGmh0dHA6Ly93d3cudHJhc2gubmV0L350aG9tYXNiL2NyeXB0by9rZXlz
-aWduaW5nL2tleXNpZ25pbmcudmVyMS4wLnR4dAAKCRCkec3EWrRgatzEAJ9NnEz0
-qdxIzRMKnwzIl5bT7iO/RgCgjxUaa4hVcZzWdpiAONJGlAbQALKJAWMEEwECAE0F
-Aj8o7VZGGmh0dHA6Ly93d3cudHJhc2gubmV0L350aG9tYXNiL2NyeXB0by9rZXlz
-aWduaW5nL2tleXNpZ25pbmcudmVyMS4wLnR4dAAKCRD5fPnjOkt/XQzwB/wOFo/i
-eiHUOP0ZyKPlt7VBeaXIAGH0xpxZi+XJ0D5PwZmHylTIdlzJ2tlulJfU3pX1dOWm
-uIa1YZsuP+ai+u9dk1QkGgSe5XAYXxqzvmbec8Rxdg0gDEdp3okAhPp9NyKtkxI+
-HNi4EgqDPIqZ1GVhk6k2Z6dfDe+QesI4FA0XIq2d1NFbCPiVenBeE0O6uQxsIvnS
-HRm2PFOn1rWSgkznx25Ue9QLJP2utuxSd5cSJTL3x4E5eYDY2nXsorBOi7+SAiIo
-Gdoj2V4y/5kOoyqnIotEeq4IGLuIedOCrv2Vvpn5Km+VXmyJRugOygMfafuLpPan
-DBbDLjWk5ySNUaYEiI0EExECAE0FAj8o7WBGGmh0dHA6Ly93d3cudHJhc2gubmV0
-L350aG9tYXNiL2NyeXB0by9rZXlzaWduaW5nL2tleXNpZ25pbmcudmVyMS4wLnR4
-dAAKCRB5BXaPdYT12B57AJ4wf88gfe8CueO6NtFQUpTHk+KLogCdFSUq/if6DUuL
-nhjPKWeIy2d9WDCIRgQTEQIABgUCPyjtcAAKCRD50BTwOMmFjc/FAKCqWAtYGj/9
-8ORw1XFC9PR9am1ZbgCggGer0qz4QK2mpM9QFtR6hGkO0syIRgQTEQIABgUCPyjt
-egAKCRBdD39J4OSfNETsAJ9aKCcUnCB7Vn6UHDRBruteeqRsGACeOJFIbOdqiVsb
-O+wpOhwfVm3Uz+iInAQTAQIABgUCPyjthQAKCRAbsIu/KpIyJaiRBACyR0lc2oYJ
-ndWEYeidHmAiR/hZ2DgMctiCcevdbfDGf+5D3FohELCZKq5UQGnW3U6eRJhMuYPc
-f4z7mp1It+yEakFZGPS84J4Ftik74iE7rIXdj2BHOJFsMjgKmHQTMXkZqA//MIR3
-3ou633yhNtX0r5omEDasRVSEWO/3Zv5L84hGBBMRAgAGBQI/LVbLAAoJECyYPlrS
-ilXWgacAoOtGe4cNkD8e0bNHVgJFwA39oMVyAJ4vidWutzzIpBSQzgpb19NpRZ1a
-5IhGBBIRAgAGBQI/LngDAAoJEBIJY50RSqhcZIQAn3DHTp0TtM6/Zoy+HK200i//
-AlJ5AJ0dCWgEobiC4oGybShrlOLlQw/6+YhGBBMRAgAGBQI/LY41AAoJEE70qYTy
-yrnIcFAAn19Xn3naRkcMPidY59zV16MCX7sFAJ9rWy0RQjrx33uXDhOr51NKuHYy
-WIhGBBMRAgAGBQI/M1b0AAoJEMoOFpwo+jiKp84AnjKg4ZxXKLa4krNAd5/2dEQ2
-iQxLAJ0a12Erds94F2GIFAqf/FSngVVl1IhGBBIRAgAGBQI/Hy/gAAoJENraec14
-ij9M7gcAn3/uItnWtZlo7d+OTYKk1ezOzEjcAJ4tbS5/8s2m9lL8CPMu2dJTW08o
-24hGBBMRAgAGBQI/OSZuAAoJEEXAIUdpq91URiYAn0jGPBL9p3VR4l+P9kvadlU7
-UlqBAJ9QHKGG5rIfjeVpTbgdDsY8SCmxg4iOBBMRAgBOBQI/HwdxRxpodHRwOi8v
-d3d3Lm1hdGhlbWF0aWsudW5pLWJpZWxlZmVsZC5kZS9+bW11dHovc2lnbi1wb2xp
-Y3ktMjAwMy0wNy5odG1sAAoJEN6Fg/i9v+g4gwcAn1+sU+MuW30qSaH8ll2xLtbt
-5eXdAKDOe0mpJVSxpOKrpg0KYA/6irm4o4hGBBARAgAGBQI/NYt8AAoJEGnSph3i
-Y/zUvnUAnj59pDFGso7TdXsHVa4Z/q2X5n6BAJ0ZdltmQ2ZJ75nLbcwkpac3bGgI
-wIhGBBMRAgAGBQI/ZGvxAAoJEGZmcXrbg1Z5+04An1D/h1hoi4RqkBtQw1/DNHzU
-gAH9AKCcD+lqxzDCPqX43rX+9UCCJ8oPAYhGBBMRAgAGBQI/ZGwHAAoJEA2WS2ZX
-Dm3qiIUAn3ypBZwkgxMIhE0klSRmAw9wJC+iAJ9ls0lNN9NJr84AzQ15HdtkXT4W
-RohGBBMRAgAGBQI/Y6iKAAoJEFTCT7U7C7mpvXsAniCYCn5ZjWf/c74wKl6VFZIV
-pWNxAJ9t0LFwcwSLiab/u/Uh+olhvaMxRYhGBBMRAgAGBQI/ZG09AAoJEE4CrK4d
-1rOA7AYAoIiHcDElbjwvQYFFd9R0kOOiOfn+AJ48x7C+1Ga2DwEr9gkKIYGekQXR
-L4hGBBIRAgAGBQI/3FhRAAoJEMUUr45LpAHDSrcAn0nLPfcadJybKcREJ08wx2+V
-9wusAJ4xj1je9ia5121k5VKu0eEryfzclYhGBBARAgAGBQI/6RuLAAoJEGSnwKfy
-zwGoWJQAn27is4CCDjyDwHxvmtLrpENuDZ7OAJ46Uzd7Hf1PBdRnBxU5bPrSuGK2
-/4hGBBARAgAGBQI/zDQjAAoJEKC+nbo7iG59GwgAnj/r1qwD6xwrm7Kw6SZi6Yc/
-mHiaAJwOpMOcian+Pp12EpfRvB8Xle/s5YhGBBMRAgAGBQJAdyn5AAoJEKQ+bScS
-gofom88An0uMhlRXemnGHyQ/KRJUq5+MgidOAKCNgcFaoiWTeSJT+24Rb3DEs8+y
-RIhGBBMRAgAGBQJAd7WQAAoJEIZ7+an70+uOHiEAniAEVpEe0EMBhh0KIMHQn7lP
-YZMNAJ9v6NuYX8B4FraeFJvwWN3Rl5a4TYhGBBMRAgAGBQJAeLzjAAoJEMzf5JsK
-Cskn3XkAnji5RM4QOb8xqOpJJjMPgIO+g6qDAJsFmagMPCtbkiKSc4dI+2l6TNv/
-G4icBBMBAgAGBQJAeMJmAAoJEKv/B7RG8yEtQPEEAJd3FInVbro9mXT3lBIpBjvv
-/e6LMishN4yrjVSF82WFNTPkXYpbloqZoYdtYAdqwi8AmEKZsfQ7SI3eJAVci+Hm
-7xnxPZO4oFx281jUTBZlY61j8xfJZe2eBHfPmhRqBErYk+wADOjFvbhypwv/9OQ0
-NDJuPdhu/dRBZZpCpv2JiEYEExECAAYFAkB58KwACgkQfDt5cIjHwfcAKQCdEXk9
-78h7XbMFngwWDXT5jtNbSo8AmwRHSKe0f7F9Gk4o2K4rmojcLbnGiEYEEhECAAYF
-AkCWzkAACgkQK8hAFiBoeJUqkACgl0cnrdeK0LhkpZRyEODRGt0HBVsAn0+wig88
-WxVF7T64mWTvc5PfUEaNiQIcBBMBAgAGBQJAl9HQAAoJELVnlGdHP376TrMP/j0h
-pFwA5yzR8l4Z/YrOwKNsmLtOhdO/CLKVZAka2y1zPv8ppCriFtfbDuLf3swnYurB
-OzIsQroxt/NZA10xFmy+xOdLaL2PGWaTc0/HvD9dR7XSLhgTk00I1D1NmSep8dYP
-/8Nzn5kywNlUGWPICcYQPbjQBb/+apeiLfNXfz9s7WbRg3rOCerNBVKnGL3CAN34
-rX4p27gjFtgNyAqSInzbiEoWWpj/UyIaCbMKTqo3sxSA8LaW1jsyIooPMCQTLMKH
-yCQ5NruqK9GH28gfOOPUijgq0cDdRw37i9bv6+W0yfvR7SzjiKJOUO5GH6T+0Vqf
-JtHDLcDcaUzOT8K5149WdTbkDGQcF5y2cRF01CYPFHJccVMyYA1apNgZLcmz5Rtg
-bNgRYAiqUxzHFxQFb9by9d/M/U4sYvBIbevBOAAI2zt9Kg9PTPLQb/s6k9krKiC7
-J8nSzlLc86iO/bLdOBiNUu7mwC5sdbKPADSchv6/Zt485QLfL6/QIIQDwrv415R2
-YS7IezeIBqNfiH8gs6zkDeqaSIERlmlrsB3FYFG1N8qu8paJovSc+WewuWN9M9y3
-V4ZS6z1h1vYsunR1a7OVPtUOkqiSve7o7somGwOuB+IcG6ScPd+eFzjQgGFrRiJp
-63Qoi7HNNS+FCCdyWGU/eKdoY4FMYjopjiYHBGJniEYEExECAAYFAkCctagACgkQ
-Qxo87aLX0pK/mwCfTf2o34qJXBM+YXZhOs9yVXpC50YAoI5kabsup2eU1mBy7us0
-lFxrfhxHiEYEExECAAYFAkDezh4ACgkQs3U+TVFLPnwI9ACdEo928dQvBLzl411B
-/3lKjJKP+lAAn18n1wjH3iTljqT25Z9sWQeDATGOiEYEExECAAYFAkDmqBUACgkQ
-cV7WoH57isluQACfVLd583iOT+OpEzqaIWfN+ipZRewAnRGIOTfv9MRZD8ZSJuQd
-DrIBAHKpiEYEExECAAYFAkEECGsACgkQ20zMSyow1ynt5wCeI0vp7KSYO0eLAGso
-5F3pwHvgoc8Anie4Winj6dvKHuF8PtWZwSreSeYsiEYEExECAAYFAkGNFU8ACgkQ
-+C5cwEsrK56CgACfaRD1Y8xF4XMe/jDZwKPeK9PfYmUAoMZ1tFUtrhTrieNJ1eF7
-dpdJZw7iiEYEEBECAAYFAkJyIrAACgkQ0/mV1Xdq/hJ5nwCgtxa311qwL0m2olq2
-TmSWc2ezDgcAni38NAgrHcDxh6DK6Z3Xl97Rcu1iiEYEEBECAAYFAkO5ff8ACgkQ
-ch6xsM7kSXgWZACbBg1x9hPoW/GAzEjfM2RGW9sA5/UAoNsVZaTnFpwfIVvSVIRo
-Pr6snqd+iEYEEBECAAYFAkQarOoACgkQQVLh8cZxhv8lngCfZhCCHrxpekkiOrvE
-bde/+/2ZdlMAoKXsVi5dC0lZI6owWPK8aGUx1AD8iEYEEBECAAYFAkQarP4ACgkQ
-qgzR7tCLR/4rQwCfR3YheOkrKO96h7w5UAtbLl3DPw4AoILhj23EPLWtD435gRqU
-v6/LDFNBiEYEEhECAAYFAkJyDd4ACgkQ8+hUANcKr/nfEwCfQLF/kWIqxd1nnY6c
-Is6PmIPJzIwAn00QsIjpIE4TPLn28/xzt2CmZb9xiEYEExECAAYFAkB3sxYACgkQ
-bL+LLlZbOPlfvwCeJZgYtJe5F6lm6DhEff3x9hyZ3lMAn0EDRPZUKlUAjxGoJwhX
-lj6VtJDxiEYEExECAAYFAkHR6JcACgkQ4NDRMRFxsE/LDgCfUC09l005ohD0dQFB
-8EyWImWea7cAoKAD+Ev47KosjrODBekcTcT5wxjqiEYEExECAAYFAkI4EWgACgkQ
-r3O2CKlAUK+MjwCgh2qJokfyjptF/V4+JsG99Yy+PUQAnRJQK3yrzugfybYwQ8cm
-v3KQrbXBiEYEExECAAYFAkJyOdoACgkQpQbm1N1NUIjkygCcDTM7VnDqO00J0HHc
-9IxMbnupH+oAoPHXDLfvpI689q3uDj84z6/3q7EFiEYEExECAAYFAkJyxrcACgkQ
-3cp5nGFDTdZJKgCfaEkpttj9rbw7n9XZYb+ntvwaZyUAoJe69mqDdJI+R2sv12Ho
-NQcuqmVeiEYEExECAAYFAkJy+RkACgkQd/4g/qpqtcvoPACgonV7MjBnRUKY9+H1
-9uA1fu/dNSEAoI2B2AWN8OpgpXpxhVYQk85CQ/1riEYEExECAAYFAkJzGKAACgkQ
-n/JYPmgbZGm6/gCdHuBxj3DNZlbz1ScOvdbzCDIy+wMAn3bH4b9hUJ2yLTsIHFOu
-RfqMN8BDiEYEExECAAYFAkJ1pigACgkQu8b/uaAhL+RNdwCgqCn0r8wIdyYxnnKA
-H9eNmQQvYgoAmQHjHDaRmyg6zJOxxmy9mPI6KMHZiEYEExECAAYFAkJ1zNQACgkQ
-vjztR8bOoMl61ACgr6C+EJa0KC7rnMTWud31d+uWqgMAoKxb6pZkKgoWIIwKJWsm
-jd7cSxmyiEYEExECAAYFAkJ2SJsACgkQRsWY28vsX4CMpACgoqN7lvoJQOsLv/BL
-kB35o9AwzH4AnjFKG+SSuj8c593EXnxLlNoUoOF+iEYEExECAAYFAkJ2S6UACgkQ
-/qs2NkWy11t5GgCgopOFVZpwxRszdALafu89Cb3QmYgAoLt04ryMpBzBlxP2cKkz
-9B3Al1FbiEYEExECAAYFAkJ3KjEACgkQDecnbV4Fd/LaJgCgnqWYl8N5EBuv4Ht/
-wRlSU9VOGv4AoMhL+6TVsB4tQ7++2SITLUDXrqwAiEYEExECAAYFAkJ3R04ACgkQ
-Dt3F8mpFyBZBCQCfVvYk24sjRPpMWQ8KVt6NqoPoiMgAoKJsCs9S2wBSurhuwOC/
-0cMExHh7iEYEExECAAYFAkJ3zRgACgkQSsOT+6LQaTbahACgl3nwP7ZEVZ8K4+P2
-coTJCzi6SNoAoMLfgKD7paNayne0SJV5OgRaiNxXiEYEExECAAYFAkJ42M4ACgkQ
-cJo/YDt+FuGQyQCgxT+bknZT5AHSlb7h7GADAc4AQwUAn1D6n+86CTh88pBcR7UZ
-0pu2f91riEYEExECAAYFAkJ5yU8ACgkQvNWtkHk/awJxtACfYKUARYRzaDjeQVLD
-E4WRQlpuWHMAn39JY3jbMUf/PQmbZP2oIFvt6W4hiEYEExECAAYFAkJ6TcIACgkQ
-H9eQw/Gi3tViWwCfW2RwrpQ7QoP0I1aEsp/obcr1i9gAn28YlDC1FYIxtmM3wkBX
-gECOiWI6iEYEExECAAYFAkJ6Xv4ACgkQem/rb/9SwVCzhQCfYYoSqONNvsvy7Inf
-u3cC+lnQPQIAniiWI4ervNXN3Xrat0cTfAIxMcJmiEYEExECAAYFAkJ61CIACgkQ
-BlHlJnS3xyrP8gCeJarZ3KQgi3gI56LLdzdtqkh2ixMAoJ5vhkjJZWtTr5r/TTkT
-Jbbh2CEaiEYEExECAAYFAkJ+zhEACgkQPGPKP6Cz6Ivb9ACdHgVMifwG7zhKmrF+
-GArIebXVufEAn0XU4YOn/NEa7TnRliSDHRFB99iZiEYEExECAAYFAkJ/FCoACgkQ
-uJQObal7aaD7jwCfTmMM+/iJ2x2CBOzELf4Y0DdfJg0AoKlJAOBwhp9SfFUxgkFu
-XK0e+dasiEYEExECAAYFAkKCWlAACgkQE91OGC5E08pXtgCfX/Pla3WvnD6aWX39
-x3J0tHWcv9gAnj+Nj7nGZS7Psgk6WO03JK9XjbeaiEYEExECAAYFAkKPMM0ACgkQ
-9t0zAhD6TNEerwCcD93mgW2e5MjWiI+5UDF+E7LB4cUAn3o3jI1aAkeQ+OrZaa3s
-JapAo9BCiEkEExECAAkFAkJy7k4CBwAACgkQuJQObal7aaAGtACfbCMlG7zmeYdi
-6z/Us3teWfKRSp4AoIMfpcTWK7p56hr/bTt3mD/UgYX9iFkEExECABkECwoEAwMV
-AwIDFgIBAheABQJCOATlAhkBAAoJEJYkg+FWYsc0wxoAnRX4Tvfb/1AfXEiGfuSC
-Tc9kgOTIAJ0eGc7xURiG7bSSPZXuR++JTCqFvYkBIgQQAQIADAUCQcx2ugUDABJ1
-AAAKCRCXELibyletfKw7B/9sgtUiYSEd98fN3ifX6vZg3jrxO0Y5iT1mEr4LIv4C
-KA3bSBfvUlzj2P2V/kLDzrpnZ63EJ7SdP6PHJVDxdCVgOJRRDCqLsXcq9Teyvvfm
-H5lm+fkzmX0sXEOAj1RH4sDxefelgzNRoAFNPBShqPkk4C6p/bPlOwGT1IqlOZhX
-akZxfuger75zU6DX26HdPuSl8rpWwRecJvLxQ1iui/0JkVh/0F0pPIHFNHpFZ+UO
-BjQu8jdkCmTC20efPYbMNQmLZ2zTr6QkooEKVPdz7g3xegVAbRHUyDVqPIUAv3xK
-z1xSkLXZLWAlAJHnlrjqpddPZPyNehoJv881iy27Zb1aiQEiBBABAgAMBQJB3Zr+
-BQMAEnUAAAoJEJcQuJvKV618mZQIAJ7t66UzRM8uS54TV0QS4Ag+FkhSSQJV+QVx
-/SisyqrCXeIhL/eHL6BsPc1d5GjpABSRDc7iNtRGiaNN+PmCdZAvzkvUh+c//cu7
-85ek6DhxstWcLPvv/5e3696xdnBLUNnNZhm0j6RoXjWNC9B7wOQiEpPuHhKOHXYg
-cLaci3+torT8OfMe+QIDpgpnvUQkFs0MaXswGKgrExGtnCtG8fWlHW9gqeKpoW8K
-P1iPvsZJPvl8UbxjQeYhcamxftqsWX2F5P+T3NQPB69y7dKhaKql26cgoTefqPFP
-QsXCUQHg/wG7Gv9sdoT9uq6+3wPRvhCJqTApzpEU6rpCfEpPuQCJASIEEAECAAwF
-AkHuv/MFAwASdQAACgkQlxC4m8pXrXxx2wf/Qn7jxnarkNm8NfsY/NxNmY4u+c9I
-dgG7OfWhG6MLZFFu8h1BGg1B4FpcTtraWAxDfUwQFoDbfK0g4VsJQ5bqvdk01tpT
-xNfaqGXqz3fUE9JwCWiF0M/vHXybdMdnWx9X7tjaIN6Zme4av+O0gXY332mYXBkA
-s4HZT38Z64h0JMoAzjmXNO8C2DU8cXc8qZLJY6QAt7wZ/a/RLafqDL90LyNXiP0D
-iCOCuWGWQENbca83IBQ4znQ+H/g+V62Nc48oNPrpWvzCscwpyUKM28x72Ho1V6GB
-yusKNLnOkMayTCi5jog1xnFHs8Dbyy9R2zogrOyKEVCP+gLURiQ3OvEXUYkBIgQQ
-AQIADAUCQgCNAgUDABJ1AAAKCRCXELibyletfAjyB/wO0VmHYAL7x7PVzk+SKih5
-uZ54Wtwf4Encrbwq77ceJhRrc0kOKWuEw7RoMYGqb/n+t5lsxYNvcVXWLMOQIzM2
-zXMztVk+B53o0RXgheGy0tE5lZx6q7NJ8ZETzyXUJrWpNGCo5hqghJRuOyOjrQXn
-BxjpdpTHtqaicy2g92V+jIJcuZ1nt7OllLpQ36H/Ok1mDjfoP2AOG8UsQUQBgBXG
-6IEavxRtjSeuObZa93FAZ+Q+0Rt+qXjHDMRaDlX7rtaYu2TmcZx+lP83sUNh2pMB
-RcObpWBtACeIEoNJoZn5kqsc9evmAuE594srZTtdWNZwb6/emt6w+n2qsGFsLudM
-iQEiBBABAgAMBQJCElkvBQMAEnUAAAoJEJcQuJvKV618q64H/inZnSczLuPq2Ba9
-CEqi4N1K3pY/SV2rdjXLHYi93UDv/b+3H/OeIjW8zgT4tICNxiiYNnbajB1RYMCa
-kXxDJBHzUBM3BT7U2E20CF+ejX9mCn6rZNwAhX/nl7DvZ6FYpurEhHLvv1kX4vzo
-AUojqCRa55l266/sImM3BcGEC/f+WN1hQUY23V+TqLMUBOd+Wo3aRVp+rxFG2rhA
-R4XhYrNm+B1mX7+1hxEcyynAmxWBowk+mVUp1NCBirRrVp0PxzKhbbC432LF+UFA
-2NnINs7P1N8HR5C0BLRSywRan1ASQfkpM4ebkCe1rP3t/Wm9d6CgD7Xg0BRr4VbZ
-1a6KwOWJASIEEAECAAwFAkIWqcwFAwASdQAACgkQlxC4m8pXrXz+6Qf/Y2Le3ECR
-8/nHJllkx2qhnvh/MIIHOau/rAowgD6QXBC/vQRb9/SpZ3aE3ylKjGM3QXFnyZGF
-DQhmKmoDXZ9NANUykLroTq/qjmTiiCJxokkj1qgRoyBoKIHbBa+OBMTD795TP5oz
-QF1Hy7Rcel7Ctp6QSjZ23tXpMsRPrq4FNV1OzdsON2jL0ldubJO9Rd5cAvUEI7uo
-WXgcLrhdf9nqkjjwYxfTi8wh8PCOp8pa2f8cO9/p3Hrgrk48xClepib6KWZl4hD+
-x/XVjLNyAfAVIZIsgbDQFx9N1V5AOz5tzNAbBVueQguz87OztLq2AVjXlbb5Ne+h
-mTIHB5+PEti3mYkBIgQQAQIADAUCQimInAUDABJ1AAAKCRCXELibyletfMp5CACO
-eIDWCeLMxbKigSKoHcbJZuZfPZy/7vZ1Hy4McXH257xFt9oWdiq8y7BBdLbDQlPW
-nV+rkjPkBPgRhDG3IotIGFEUd82UyQhZPAtNIpgHQF3UkBS4WqZ3iOhb6Ip8LxTV
-JfpGJnd+d/JTFvIDSqGNsxI4swDcQZlrlzNY+Rn3kfqnu38iD2FqUKWvyw3SW6gE
-7OtMF9E1AXAOV28wN5CvRpktdq3asO8j3Tjb6EeBv1lwg1bUgAur4302bGv3hf9Z
-tre69muhHqkx18lGmXGeI/sWbrRs00X2KzxQ2sWm9yTa5/68mPOlXAYC13pQhErD
-UGAMRmnO6UUTVXDtI0zniQEiBBABAgAMBQJCPUkVBQMAEnUAAAoJEJcQuJvKV618
-Q8YH/2WuatYY2ccpCjE3o1VQ8GTJOQAyWxM2oZyaoxJQeIQP0SwRWQZGu96HmqlI
-+/cy0gvASg536z+/vwYytZV+ZP1ftrd5DsA9GtQO7inMN4bQ5kMgURXWx6d5ZxPf
-oH5z8z9bwsnTWaZKHXXbmDdMxkFHl2APBp9sF4u4dhcJLj/nJcTbRgXmP/7LCW2H
-e29A2aksvsD0DVI3DzuVc7GcPPov1PRZyRq7HeA7fl6wo5mEAHuZNARz4iywDR4r
-MKFru6hKB0j/u7NJicRUvimt9NpF2k/Tcl81v2ORkm4cxqR21CTJ0aOndyTe0s84
-yH41w2f1j+Vw0fpPri84Vqs9zSqJASIEEAECAAwFAkJPwBkFAwASdQAACgkQlxC4
-m8pXrXzu0wf9G/YsRPTr9W5VA5RjEBsbt14UfZYN28WLj0GxbJpONPSvB8ujzFe4
-UxS2SVAajMn6kzdff3rXPJZjo4Dl9VedV/iLBsAqBXkNZDmaxVkPf41UYjHyV059
-HXApHloZkPDkDnq6SRRwOpNRza5FnliVJO9lMO2onXBBOp3BM5tiHI7CewNiGkol
-BoEwmmGbiYfkc9Bz0V+RssmiIrZA8z5/bmUPpBUqmQ/n603Lruk4mDyI8erN/hOP
-U6e03nPonw3NC0z6S6TAbunc8U8iSBl/2ctB3g6iGaXAJzkixxpRrD/UL5TQePmB
-mTgV6Ifj2AYRmE0Q55YzxVy1dcDxIAQv84kBIgQQAQIADAUCQmImWgUDABJ1AAAK
-CRCXELibyletfNKQCACDwG/wvdNzqgGshs4X/QLWTmr+Tafm72gA9AWnZvgYogQ8
-5Tx+FPzE3+JZmXGMwNI2ePEEYBFlDbWA1yDyX0W+9x+HCPqdmuPp0jp/P24FUn6G
-ZVxlJKBGLjQ9DTMgr7MeXJaIbrk+UdhJf7JoatemjLWMhsJeSYbSMcwcGugP56+Y
-QSTV3IGvKfPWlujL/n6960IGfZY7t73G7pyyKWNzvii2ss6abwFBo35zP5yP3zI6
-XjYZ8wrbdeu8cvYnNBvr98S6MS6TxDJmAeVday5dmQjz/0dDLZsENkrHp6NZU9nw
-I5vjbLbsKDmlCPlg7CWGNm4G+LpXTHuYEBWxh2zpiQEiBBABAgAMBQJCYs77BQMA
-EnUAAAoJEJcQuJvKV618TdwIAIO0NPJo56OKJq4EYVWvDWJNTAjLqk8NuNsE5tH9
-1yxqTEaG+QvogtxMImZLts/iBdytTFYYyhWQRqhGJJAcaXj0YJ/GvNT+sKSGXKLP
-BTJABmsrGgJXCxcc5sPQ/95M/TiA2LdFb/YDdyLQNRPAcq5k48I2RoZ7Hs1W/rIa
-xZvlRzvDVX8VFwKH8o3MGQs+zzLsl03CPfQ316z1b/kABCx4406fHt1SrwyeGTkQ
-ACVBVA2HMfnWqn0r3inpyUSAnWhgT5X/Cg2SIrJqleEyQ/mrKBTptAgwUJ1cM2EQ
-PxiB/ytu2hQanygn01VFPyR+0dmsXTZOhOD84DWcmcwxNBqJASIEEAECAAwFAkJ1
-P3MFAwASdQAACgkQlxC4m8pXrXy49Qf/bSLASg5fxEscgsSdaJ3Eid8F3492bW36
-IUcWv9U8xkCKJB99Gw5T+5B6K1i134Cm4wHhXqWLRF4KL6aCGEcSYcJum4rFMPiv
-7kmH2E/e6DmiF9kk0oymVFJnuN3yctkNpfA9ovrXgacJrwzgcy11t1octK9RDiG0
-qBxCD/qYHgf18KJK9+VK2vyMzdm9ZqKwih8+XvDnNkdNrEdSJ5uIULl/TfmPn5Zm
-uQ93s+ZdnFflaln3smuTHxNrp3K8uWu3IJWmX74KUn4lNXAteKWP4adqFBEVzbLz
-d5fzs8XLF/w5dGC3iS4CUfqWpDfulDxe7ooxKoV5Y/QnmZkK+VI1PokBIgQQAQIA
-DAUCQocRFwUDABJ1AAAKCRCXELibyletfLeoCACZ9K8f2WtGdc1SeuQc1yv4BN72
-pr56/Ks+Raky+tOy7P+yLCBIEV9KaeZj50LAu3CnESNn6TLix4a1gxaL+68yHAxU
-wV5S341m4bUjAa1e8ZMVhdJifsqe8w0TyjHx/yJ/ciZWWZVIEgKTNhzxdjIGSn3l
-q29ow03AnatRCz/aHhiAzeeHSsEwW1Lvr4vz/isPMvWDzJSnofUUD5jgXWCDMBat
-bVVFsCvdb3UiLJY1Yh04ZYGFIiEimHlb7fLaZ/pDosL70SnSYO/upn3ojaSrRITC
-Zs8wsUfKP5icv/eqAdwtSlpeox+mSLvGhv64S1RQFZtFJRGmk9xNHDV8CJxpiQEi
-BBABAgAMBQJCibZSBQMAEnUAAAoJEJcQuJvKV618dC0H/14iIrbtLfDkh2Mcc2iF
-s0uD+l3ibF8+qtfiGFZ3rC82GHGNrpZLgbALsdGV4o1BmVrLMZ1d3z3UXV0kxWCl
-YVZ1zHLx+cDRXYT6k35iXglxXtmSxUN7Ed7Uc7SN5CCO9neoi3urr9+lyjZHqFq9
-6lpFP0T85/BvTBt/ud2CR/+eo+UywI7wjDEIYc0qo9JnuGHd0n0FqNO/Rm2yBzf+
-lWyvdjgR0+6HHy+tfMehksHC5+bupDAfGoKuzzD4qp+fjtTdzAYEuoXg2hNrc/8Z
-qEFPoMQXm89IFRorEhxJbkvP1jQObUFSPilQWXZu5F+WJOEVXZzrQmUgqC+ZOfS3
-bKiJASIEEAECAAwFAkKbgfsFAwASdQAACgkQlxC4m8pXrXyfyQgAtHrfLtlX0E0n
-OcawD2qd5HAFhvdrTy48JP/Ue2JitlyEAWj9QpC/y+aApk62aLstUHdLg6bQIdsG
-QiQwR6euqMOuolN9JqfH5JXyvt5M4zRlkJjcHGLv/x+cZuojFz9acHYTLCkawm9+
-MOhcy6piHVW/Fh8E6V9Lb9TMqDT1OTCfw9najnKmnA5dulvf/E3Skrv+cETp7vq+
-g7UC9HvucV7i2Dqj466WSgIEnjibenqeZfT6wovgs9dFiACEYMCrfADylpT/gS87
-35eEpWXK+0AnPiasllmX5LPSfaDhKPSOKagp89ILtddx3TlAEZFkERMi5UdamNCV
-MI8n8ft6O4kBIgQQAQIADAUCQpzTCgUDABJ1AAAKCRCXELibyletfGzIB/95hsVS
-uQ1XiKqtMZPnUW2U40vNHdw61vD5wK9d5GwCKMfUPcVYWaTCHCNM+23tTAg8kVjA
-dOHGQlRKW/gfQ64X7xhSu8Obps/B+lwy0gVkjje0rVaaZOzFzmAztxXSBzlT95wt
-KL0VKdIt1R8T4Dxc0iPlkuvHWrEzdUbYkBjrvccXjgbqa3znaEQysLGgsEciyl+1
-yctjfxs5WoQrItgx64mKfIm20DHP6w1X95qY+ZATM1JUfykXFMEg7JNqZ6xlYFAX
-bGChrspTfq9nUsyoXPUncA97zBGVLM5i7ygagIvt1YeUi0+g/ojpXT7MsoTROHD6
-66Hamw2DzkA6GhwHiQEiBBABAgAMBQJCr+ynBQMAEnUAAAoJEJcQuJvKV618+aoI
-AJIsrFaXQIym1cznFJSQlevgnfrTitD2vRwV6uWSMQOL8fkHJO0QrqrpmvzBPep2
-A77JosZQ+3kflkbd68SXvY5yfpxxxXF/eLv1kXKaGqcp2VYOMJA+QWzQqfsU7CVX
-2nkpV4tgFqaq5x9JJ9NZdapJiDRsSuuqPbAdWeDufl9tFVhb6ZBiY/x8ZBR/4q+9
-rWjHObn3JS45Z+XQ5fYEVk+26RkU89fGuSsGpaF3zgvEM3lLmxhfdY8MSegg3+3S
-zArY1V6nfdccN1n708CRYXXwoPWPenzGgHOwbBSRnf9l4IpNxoH9Bjcs/YM7dlR5
-GGD415gq1w7YysVJFVoiI0iJASIEEAECAAwFAkK0j2sFAwASdQAACgkQlxC4m8pX
-rXxWRQgAkabF23WJvJt+OTsYRL21GaVNCSijVTQZRU8LI+nIMsXJGDCoHPtcPiQz
-2/nXwyq6YOC7VaXJetShF5souL5w5L8it4oU9Awk9FScRxitMl7ty4n+lU+JG7ao
-RfeuaDTcYcai+CXsed5PynPA55oKP24c1BbT0rBaMjoi5Uq08xrCqOSQloxfCLmK
-/efJOWUzHRE1MtyFr+eq9vbQvlvaeRusZbKBZ7Gb1yC1+qdzv1R0J0vN2MPUO15d
-5XhO5UhVgKUTIojb4mEd16r9igLOn78HveKh5uVX63JrvOYUaL0jO+FlJWdBtKMu
-Tgui7Q7BRqJMs15fnG6roFg8gLrWnokBIgQQAQIADAUCQrc1vAUDABJ1AAAKCRCX
-ELibyletfHtAB/0WPN4Sx5UVX8TNK1qDmx06B4zy5dcU/wqgWIUCERZheYStCsDK
-X/VzHYladi0dAJKoL4+IHNXvEaavtU7WlJwYThD/MwaNah6jSyX1Cqu6/A96QoQl
-4AVs4fPu7WGVje25yNfPZBdJyQPNVfipM6uRL70iFJ5BNIIzhRjlPMX74rj/vnU8
-kvoSWYvXmPn4Q3KLv6tcfOn3Mt9wMZJSH63sv3jbmRE9Cm0TgHa1UAvgOxWT1A7c
-Nvhrt6Fy4bsxL06QG0xr4PO0nDbRGQ21yobITMFukfQx0jlnWBf26R8p0D1S1afm
-/TG6x7Ilcw8NkV8tFH6eJQ2qkiRySXXgcRnziQEiBBABAgAMBQJCyQdJBQMAEnUA
-AAoJEJcQuJvKV618kk8IAKQmFB8do2eq8F0T1rCsZrMrkjQFhKTTXEWJzg17HFjx
-5brB81L+LXd5LwTI4rL2C5doP9N74PuAV9a9cmiydw71vCTnzSi1uhRqnBRMmM4b
-vSOE50HMIQsidGKEzSVySROAdvYyaBhVdN+uyPAncGz3DTq0rUjoriW2DAxHMJLu
-l8m8iNjo/LogBx0KRcWXr7xPR6izOVIqINm5xMwrSBPoR/PWuG7w+ZAKhy6IUGiM
-F1prrMwG3w3b4bXDcCyJKgA4jRhD8bBWGWhR1s532ZLmvSwWy4xf1LPWlo/mEM89
-wrGZX8ylQ0JlZ7grLaiHNHX3m2lFb+IxwRKMfEWuu0uJASIEEAECAAwFAkLQ+IQF
-AwASdQAACgkQlxC4m8pXrXx0WwgAkm5C20y4dWf9Phy69i//dNWwShHBK13hIO+F
-ROqPfJxQYdDpCGGIE/IGhako8ofNYCIf860qto+/gPWUOX7ITH9SX5v2q2nL+ojZ
-D2rI4vrFHER2Q8mCQvNCT1D7BLLPkAV3iKtqGSHRC0mAZz5Jer+ejs8wf2m6fZTi
-5tOk6iRFMWPGVCX4rGN2Qk0R9SqTHWhtZFK4LShpiNxT6fAnCRBzdepigRid/skU
-ggXqjFvezaJ+BzQBhJahlhnpKtEK4fjAfdZDtiIpowGbZgfIIsB0HAT4ujj3UDy9
-kOons0iEn/NR78v4oosqz0wxcqAZORA/tldmoqlQK8Ix84BBpokBIgQQAQIADAUC
-QtGddgUDABJ1AAAKCRCXELibyletfAkEB/9LGSHXus/kR55RQ9XIgbNbyI5opA5A
-eiuUY7nAF9n9pcg+xB1GVGXM8yMs4lrU4Vh+vSKjtH2Gocs7TwpHtBItbVyW+LQC
-nEOyf+q4Orj/vhIvfeNUuyFvNCHIwbU0evDM59Vc9p1RkhBD6vJtpCX2bRdUMGuW
-9eGTSYlxDMamL57Tpgm0P1Bvdw3gYnfk3H+r/MRGvQkImEnr1B3WqmClB0Fmajs0
-ZbBkuI+suwyy2lrXA6e+3yIQEqHCLSG85GOQG/xIro1nv4W426NhXY2er8ZKSiWY
-gOddKe5txPR7h80lA3OfEmOopNwIuN1ld0BLltY3DBsb8er/gRDyR7IFiQEiBBAB
-AgAMBQJC42W7BQMAEnUAAAoJEJcQuJvKV618w58IAI4eyED6P9wFdR96vNQ4oBzo
-cJXcPXcC0Zrw710MTXf4Zn6TfvB3UJitboab5fEYVA5RUy1E61SiwLof7frF1XW7
-CClp+ugsDOxyx+GdFGV0q+H/0mpPbsXqiBMMB1J83uii76dNGBDzZt0z9c+FylzY
-WAziq+1NTQKYcHqJhENbV9ZGvTYAwCLA/pB6kHkSJRIJ9yPyg8vtYy1xuRI5hi6g
-OoA61rMIgs7hFHtu938JDPt1tvZJFt7Ux6YV3rAOuDmgK2Gvgz9Q2lVg4xhKd3Tn
-ycnjD6scS1T3zWcCKSrW3v5+AZ9HKvgA1kiJ6mknSbVImxJ7LKHKLsrIy/sJOm6J
-ASIEEAECAAwFAkLspEwFAwASdQAACgkQlxC4m8pXrXz1RAf+NfkWCYU8c/Gowyl0
-u0/tVxeFPxsx1GpKjaXI1tVeg5+Ov4spaHeZpYjdIO5kRNGSzdyVXkO1Rgz9RK5e
-V9vClFEYH0l3QEUxM1QQMZqUZAbmxH/fN4vnr44a6ya6ICLgn8I6InHFGFO8t9Tv
-KTA1eqS8uElQqUH1dNG5rxBqDjMOKjk0E0InAaIOeDHdvoBcVg0W/FMzlbhKPd0e
-czpNyOtonq3z4EracangmCmDxEy2PjtKZP6LlMW8gvvnzIqL77J2I8mbC4vXwYxu
-mgne9Ghou4IPqZ+Lb4cBaPY/wxxZ7F/pqGIwcTB0juYqsT0qZ430LzO8xaAb8Fry
-X6le7okBIgQQAQIADAUCQu1LBQUDABJ1AAAKCRCXELibyletfN/KCAC/k7OMxhpo
-XobydxOLWRJWucKrB1zTnN0c3VBElE2zZ3FUbzAEuCNjbCzbc7iRxKeDgcKtktFd
-mnM590InYm/7EVdT9r+TB05mFhPwrCbne3UcSB3PBd8ZB3o0tpG/ZMKsdYnftPKJ
-+voqpzdmiNZJMWYdeIIluzcBuViLzZhKnm0lmthdUOl1GildNW8hqfbhM7q265Rc
-jwVbTm+/Rg5UCDo1uFv94xqjO1g7scgCl+N9jjFBlRRin3Y4V2fTmNIiEITnomak
-DvTmlhs+yxd1BNYBau4rLXWFC6Qe+L9xnNWefQOLT98NokPU8RfU9IJ5OI3ColvA
-r2ITEqQocqeuiQEiBBABAgAMBQJDBw4vBQMAEnUAAAoJEJcQuJvKV6182VUH/2+o
-TFYzVeLuHJzhPQGI1x00Vh17MAYODp+4/bQsc6wrRykuidd8tklc/BlvPeWqjKDu
-W3e16cEf/05GMdGpsYNMCgzH6SOjZ3yycNg8y3rB8BABJ+jSCP6IoAUqqRUH7fUF
-VzA1SBTOkBwvZ1oGspDyYdGtn19ForXFNu7YO85TRFnJ8JIH3kNBXriaemmrfSi+
-9UFtjvuC0gH5ow/3p86GO50DVOpFzATBNi/q69FOWK6XqX8EW/tPqMZFP3MIWD3F
-al9l54uL6s8OLulRAhtarpPIpAURFr5+Ex0euKbqow/EBRPlQHGcutv+ONK7n/6g
-gpeentNDAyaE5kFdAG+JASIEEAECAAwFAkMIYnoFAwASdQAACgkQlxC4m8pXrXwu
-oAf8CxBZiAGstqB0M1IddHHd19CvGT7zheJWn3BVZpsBPvM/jctN/bYNKtnHu3IY
-DGUybNP8jHeeYEswj24tSPaZ7MT54LhU7HJdKwdYtMUp+RrBFWzbIJNpz69JwfPE
-TevT/IV7dnXz3uak6ZDDXRCjL6+ETbN37uAdXLASh4MD40Mfd9r+fY0Ayov/qRmG
-Th3Bxy9/f8ZoUz+CL7PllI9wt4XtX9su54L966nvcuODqUR5C6x/bw5T7897Wmkw
-eh5ICdPTg/hz0B4morKtJnayy+R106byjHaHobfuth6juGYeYbHXjzMNoWYoKqDZ
-uk3j7j69aAFZXzC9O69j5T8glYkBIgQQAQIADAUCQxBNOgUDABJ1AAAKCRCXELib
-yletfLt+B/95xkZZwYbLRDRw++rj+uO+RmjUyHxwx5jQh2mppbOhgo2jS9s0DLUp
-T3gAPm68YTVjLxAYV2hDcd57SNI7EGqRU1bQ8s/7G+Nqnc9qgf02BXWaQNDZJ/QM
-dvu0TIu+IkQZcLTqo26ROLlahtNNKDMY0PxM1zF/cie3fztnpHATNuWTYYGeZdOa
-CeGYy5Oj4TwNhjIrOIINPPttxO4+T+iShpHC9HVjtC65+kK/m9wAYM2CxUahSTft
-fweoeIKGt/ML8ON3Pe1u0dafqY7AUiV6PYUkg2QPsjljCQLFxCxP2vyPZwHc0Ftc
-ISPcRGwbYyXaDsFSkUTJAQS3qvWnZ2ayiQEiBBABAgAMBQJDEPMBBQMAEnUAAAoJ
-EJcQuJvKV618WlkH/3bC1x2yaa4u5hfUDR8S0ng4Y/uXYM4iLgARNUciZw7SV1Ke
-pE5b9cQDYmez/tmEyUfsZWthKQ6+Ne3vBLjLSLmNyNTiO7YIWc65RcJblrS5+fVt
-Cv8jGwFr/KlH85EqgRM0QVfZc4vPz7FoIzFbj2OeucR1dnc7AMEpHVGJAq/TEKNY
-5uQ5EAFB6F6KbG2mMKlsISoK5v9doZnQN9mBYnhJ3qhBJwB/DjNMG1tpp8QtCFyC
-xZAYQB/2JGehFrN0q9iU/W2aCbEvTTgGIuLGEOLlrplR2MHgWyiTiFv4eF8o0mAo
-yw80Gp7MGLZ3oKk4zbjbKp8S3BtwnMyILFuN++iJASIEEAECAAwFAkMSQ9cFAwAS
-dQAACgkQlxC4m8pXrXwXEggAua/5xOdeyymVGt/C2cmoIZMuKQX6o6mBb7Q9NUXY
-durcIAicopYFNG4FpIb0mzMdsTQGXB1KJrfj5f0fUp+rtdMWPda3ThMAx7zMK1Dk
-uoorAkGGiCCMqmeZS+9TvcLKwHZTr4t1u2eqWVvdM56u7VhNri1to1Zw8JE60zz0
-ZB6IhvFBCW28oCOkNIZnergmZi0Sw9RdUYIphjes+1sML43YE83jaFGZCcrKc4/J
-qBqj1ZZEnIjYy6MFoxAsEEnAr03Jpsr7sA+39+rdWgbYS/OPOFqRpDtr3kFQZFGp
-M/rN0XnoJGFO+m3GQCVw2RYNn6yNZOGbN/NI+bNySBiFUIkBIgQQAQIADAUCQxRC
-LQUDABJ1AAAKCRCXELibyletfMZqCACizLb1k+yJZKYe8sGCy0gb8Wfr5wIIoSDV
-KUsOo4VrVbf4Z+pVwzox4BlF2WyQ8oMdNh8noCxDFsQurVthNayiMwTEWsWcKvGV
-nUkl04scwcC38gy07+dP7vzuerpvKwzBNwBeFmT8sw8Cipa8RlXh56l6rXIyCyuZ
-WMeLzfq5UjsYXax3ktQ4VtFDOU02aXpkp1wgQ5xTFHU4v37VoNkuzV9UbZzLCjZG
-ttPaNNpHfIgsJSV4IFAcw7ZDr8PToLQ4PgT2CD2T1/DD7JMeYdnKP4CntUXJPN1w
-YbG6FQtz6Y/NCoEJofRbVJDd+jh6lKbRbCDvA2dv8rS553knOqz3iQIcBBMBAgAG
-BQJCdz8MAAoJEAgUGcMLQ3qJosMQAJ4BAkBO2LE3BinWKaIrjFcYExtn+k0RGtFI
-b4zQwBIgOjH4Yam11zZj+YAfzOsvl5aBuL2Yc8bZSKR1WMQ1581cMSAnps9FWJjJ
-rEp8FG9by5DKTI+onYW14oebiO+VJOciLrRnvdnE9+Avx18xtuwfMyRAADARggNi
-ZnTXSSx/ACiE3k5/TfbhIaDw0iaE3+IUPfkHkhrFyShvCpgUNWEX+99KJfiDbboA
-OZ/BDf+MvjxY6dFQW+uPyKH2YFLxWeENWjAQVgrOUqchVStmKoSmwZ1Iz3fXJDgP
-WLa/EQm+13J3uNo7BHRht+hxXwg5ydoYQoI64nkWaARaGZbTit23PyBVK3C+Gqc5
-k9xEr097nGz5aNRym3DiBQTJgRkqcrwcgqXjFjeoyGJRIFOEwTqN86YGW5MXGzEJ
-3zQd95eEphTVoI4SdAIDESEmds/khbh8fGo6pXYqC7Kt/01CRoqsDTczm+X95CkF
-j8Zr4SSm9xsN7VheN3E4eAPLuZonjrC09AblD9jpfJQIdH/EpYj1jaqPycSct+uP
-xXYuOp+2btiKvUQWU1Vy3hZ5lb8J+A7/mzom1Zpo1X6Yi360DiEVeuRw5i+/gp+8
-ItqRqQUXPCZ4h1Fsf1tZWe0doFqhqX7wCW3V8zkvtAOiBtzbjJMVZpvFxPIde2nf
-AiwUNnyOiQIcBBMBAgAGBQJCdz8NAAoJEFA6oBJjVJ+OkLUQAJWH09eK8jjgL5Yi
-l4lGGqAY+fONk77HAusNllQ96NcoSe5gq6awiB3CEeEyVai/RgoE34OesvXvMQYG
-3+DESl7D1I1TLMCX/OSc40qqgmXZ3Gfu0WO+PPZBx+ykCFqAxtFUxrjW6dCPTwPp
-F2I7qfcExYBI6640BdCh+hAxd6bgLPbsid0RQgKotdqyx/R4bliRitQXa8ODOz60
-hK9AzQYSi6ifaBSN+mYJ4YTNN1tqrsg5Q0MrGyWYMPxTkdEqfVsnhF+CO/Ca9M3S
-99kM13nBCG6Ft8fwhIBg85ZwfgVIo2PDdrS7xjQpUYpW1R1QeZK/b5o0fgWNikes
-Mb9zieN7GKtNKQPp2BsTHVpkvj9d+VvoGSYX+BS59j4d9I0doW+0XdGNj6SWLBqc
-hZ4ybMd1ysyc/hUmIT/aX8JhNVA/Q5PkgmWaYV1F6P/xjqx/RG2IMr+9OnM/zW7f
-nVEz6YQDTuADZESCdcuOd9O1Zd1Sv5UOeWRfuYE2jYGx71TKIywXcNFRqPxeDE3u
-WTEGRDcEXQG+bs1d+1QvXitiN0zDBgq6cpfNIbXaWc/HIg8LOm21xhDFAw38L1fT
-iTXrDU5UNhfj3lrkvgs2WOE6pRjP6ve0GFIKByi8ezb55iZTNyUgCPM0f/mVZrnK
-LvKv4vVpKzrCiwysGoQDck5DN3oCtCZNaWNoYWVsIFZvZ3QgPG1pY2hhZWwudm9n
-dEB1YnVudHUuY29tPohFBBMRAgAGBQJCetQiAAoJEAZR5SZ0t8cqDUIAmIfLRBeY
-28PXBqwOJVKcxtMedw4AniDcMjzOXhPz3hkFvZgQbgUfRF2JiEYEEBECAAYFAkJy
-IrMACgkQ0/mV1Xdq/hLXdwCglqvBfuZOFvU6rilTNrhikQ98TbMAoMZYDP30D+Yb
-Lo/Ho/UMSAQkdnR6iEYEEBECAAYFAkO5fgAACgkQch6xsM7kSXj4wQCgrh5j/Tcv
-BsR+a+BgccpQoIuT7ccAoPGCTPRGxas30yBVzBhEUY3gpGOriEYEEBECAAYFAkQa
-p7MACgkQQVLh8cZxhv+7BwCfRDPF1Vwqo681qBtkxdnuu5PgZN8An3EpFV31J/bu
-x/DERGQ4bJrec5XeiEYEEBECAAYFAkQarQkACgkQqgzR7tCLR/5w7wCfQfOvnVHB
-y/M/E48ZfU9XFr+2no4An0f0KNhZjZ3+mUaNkrkkYQoQEC0NiEYEEhECAAYFAkJy
-DeAACgkQ8+hUANcKr/kWnwCgi0J7zAVwn2vZufTJ7DJvIap5k/MAoJI2Y7Z65NW6
-esVYS5BpLdfJhe0IiEYEEhECAAYFAkLMsmsACgkQzN/kmwoKyScGPgCfRiKtZpTN
-ULwMA90Do+UjUczBO0wAoJzLIAF9LX9HWyU5UXidQt+eZXrPiEYEExECAAYFAkI4
-EWsACgkQr3O2CKlAUK9TxACdFn3HOjQvqBwQjFqEp7QlGfxw5o4AoIa3SuTTOtLJ
-hBmo7527ddmzrZzyiEYEExECAAYFAkI9iLYACgkQ+C5cwEsrK57aVwCgxrua39iO
-ij8hZ0xyVehvqCyl+6kAoLyqLbJ5dllzfRGxjxjc1+ppenTGiEYEExECAAYFAkJy
-OdgACgkQpQbm1N1NUIgOmwCg2dPgDcObDv8rO/MGHyZa0lqHacoAoMXv++UJaWXH
-bNWSPFIgOpfxTeqqiEYEExECAAYFAkJyxrYACgkQ3cp5nGFDTdZrfgCggGiZtpj7
-wpw6pVcF8tfswF4dsZAAn0rxNKNXXN9u+IAg1OuK0rsec7cTiEYEExECAAYFAkJy
-+R4ACgkQd/4g/qpqtctw4wCfQ2aNzJs/OYv1an3nPikx05iT5ocAoMyo4m6XmHDZ
-hphBvK8Ua7Z35YqxiEYEExECAAYFAkJzGKMACgkQn/JYPmgbZGnZ2ACgh44bvHWX
-Bq5Kovj/7+R5jxP/b5gAnRrTD5WtARrsItSBl+l8RkjZR5h5iEYEExECAAYFAkJ1
-YRAACgkQArxCt0PiXR63LACeNrOuAznY8YMEURjvIdaWgU740gcAoMPjKBTCQO5t
-eqZcyel94oBR0Cz4iEYEExECAAYFAkJ1pjAACgkQu8b/uaAhL+T2JgCfYtVnAwrM
-axYJghFByu/cdRN9R80AoKe+Hx0fHM1sU8IdHtn7mIMTeAt8iEYEExECAAYFAkJ1
-zNYACgkQvjztR8bOoMlUowCg1GdaFpmIOr/UXyCC9sDcv5w0jBIAmgJO1NL9gTzk
-7fgy2VsYJhOP0qrwiEYEExECAAYFAkJ2SJwACgkQRsWY28vsX4BR7gCcDRTfolut
-/zVq63qgjjcWr4ac5SUAoIvk6x1tksCp++oYS0lUV0MLjb3kiEYEExECAAYFAkJ2
-S6gACgkQ/qs2NkWy11sIpACg0Bp7T1euRDcJH1N7XLe9WbR+DwYAn2gG6nJz5C7N
-uqlmPJVZZP7QWRIJiEYEExECAAYFAkJ3KjMACgkQDecnbV4Fd/Ic+wCdFYiRyNeY
-PO27a1FX0hWChEWz09AAn1pBfBLFI54DoZvhBzhkarBXJLfyiEYEExECAAYFAkJ3
-PxcACgkQhCzbekR3nhgcPACfROmJv+sz86kfYW8k0saSqBzvBcIAoJi3RH+RZB7J
-pP8/RyQkLZg4aqxNiEYEExECAAYFAkJ3R1AACgkQDt3F8mpFyBZ+GwCfVW2vykWc
-NnfmrcUOej3v6Lycw4YAoLUIrGTkO2/X/673krDv5ixxNt5EiEYEExECAAYFAkJ3
-zRwACgkQSsOT+6LQaTZ+EQCgwX2d3Hzpj/7h3eh9Ws4rYpgBS+8An3TUCtOULJ6c
-HhlDNkzXUFquLKhgiEYEExECAAYFAkJ42NAACgkQcJo/YDt+FuEFJgCfa34UiSTn
-9ecrC3YFpVlvA/c24b8AoJX3QrL6CDxh/PEwni2CObFdAcVCiEYEExECAAYFAkJ5
-yVUACgkQvNWtkHk/awK/gwCeKnFUSolfUl09apDaZaEjhn65dAEAnAp8o3erErE6
-S+Q3+WFEls0pG0BTiEYEExECAAYFAkJ6TcYACgkQH9eQw/Gi3tW7XwCfY7He1SCb
-I23NXL/YN/veA0K949sAoN6IfvdTL8TD3l60t7ka03IJZBtTiEYEExECAAYFAkJ6
-Xv8ACgkQem/rb/9SwVB1oQCgqYf/1H9CiSjXlhplc1EKcCAVRW0AoNvQT8M4e174
-tUv67zkr1nA7Op1GiEYEExECAAYFAkJ+zhMACgkQPGPKP6Cz6Iuq2wCgnEn5tGWv
-mj5RRPAlBIS3P/f4MwwAoLeBZwU3TrtfCm9fqnoQnHqR/xr8iEYEExECAAYFAkJ/
-FCoACgkQuJQObal7aaB4+ACdEN7g2WKpES7QFp/ALG7lLNv9FKIAn12MSR1vCwKf
-bRjh6dSFOdbx3Vq4iEYEExECAAYFAkKCWlEACgkQE91OGC5E08qqkwCgnU3zcfUR
-v6YXqPXSPBOQzK/8LoIAoO6izGOLUMcMd0KB39jmLNuA7POliEYEExECAAYFAkKP
-MNEACgkQ9t0zAhD6TNH9mQCdFQuGRjnVuD5ZfKQcUrCIb8j1nfMAoIF7CHjeo79q
-fteokg+d7CAYq0RZiEkEExECAAkFAkJy7ngCBwAACgkQuJQObal7aaBaEQCfcq/K
-IVT7x6TmmsZPZJJjYiYyi4gAoJqwIGt5DDLb5tlkzpmwvPXEJgixiF4EExECAB4F
-AkH04tYCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQliSD4VZixzQFKQCgjpjp
-s+IXSNkiiIsBkOBuJWKFdnsAn1FUSErS2Ox809VZ0JMmas76sa/8iQIcBBMBAgAG
-BQJCdz8XAAoJEAgUGcMLQ3qJD9kQAKoG4PeRjVwfv4W+es+oGKd4AmQeQDW3g/sC
-1obWPd7g9GAhITTIdAJ/q1Y7qauaeUa9zYxFfMEREHjfwDEk+tXU5bkg9w2FB0iD
-5LxyNiDLIhaMWMg/tpikJV+m2fq+nCba67RYOmKTcAjBn4T0S6qmSwyNEJguP5+J
-jEc1+dzM/w+r4hlgKbb9NPQa1OXQZVoEKa4iN+Hn7Grr01bglEuGzXv2EU8QM3dz
-bKRWZxafD3kYaoU5fyP8fG71+7drqEZoP4A0cvHiGUaYvGIu0tKp82AW3HMMi4jL
-6aNt39fJKYlCQOjC0TeiTKyEJ+3dPTMr8692xkdHXc/HrlrQBv+Wlu66B44/wZly
-rmK8itvjrqLHO3yuqI9j+88iE5CRfjmkZw64aCjlgrA+JHx06QnPGIMptjxQFh5f
-m/Gt5VToAEbvYEoQF09rgbG9osx0aqrluwh/MhGhKze2bmxV3PnT0xKeC+950/Bz
-jaoSd80JAP96gzJSZE/hjLWUg+s7BnHi/FU5yyYUjB9olhC0UtZINiym04uuLkPj
-pMkWEVSmcnGcFgd2C6fQRbEF2ISB96AXB7i7iFI0ZnzrBlCqIYWMViCT5mXKyPiK
-XU7hbFCJM/Yz4KyEF5TNDnbstvneDLjwffoC0LmxGhWBA2mMDAkrQYMyaLz2mU73
-kzEUVWDDiQIcBBMBAgAGBQJCdz8XAAoJEFA6oBJjVJ+OD9kP/2Hi0WGp+w3nqlFR
-qQ10MKxOElTEJIErPf8GWlM/m43GKpwtyf6CbNQ7NYwEkpAGoq6zKMaQy9kRxtQI
-FWleRMDsrkmpGjvqmNqkaNbEhFEx+bApPtSsMaj9bO2HjdBJZxq5YwkDBusV6E0T
-NbLBfYb5teq2XyH632X6Zj+AUlkk8k37KnY8kxl+ccHkhClXjwYZIiXggUYuIM2E
-J0MZ9EA+Db6WKrgrpLLMBiTTwZIRp8J9hrbo7a9WZ2iz+X/A0qWxVzB3vdpBX73z
-NRAcf57uk6VdWmQsSFhiCSiC1gPvakJ5rQQvgcQdB0PkpFNv20ncZCyqCyjl23zg
-6VUU6hjRRuZC6zlQ4bOasANIHZ1i6Ri17eHyisKoid0lSk3RXpL+XEBrpo/gZ80q
-/aQa39F8TSyPborks368BFqT3z6z9CjuErynpZTDbGBGPx1hNOmkLGccExY9oI6g
-7RBMyGdllkruN+Me7O/3gEdhMwLoOZX54zJyiL9IWMITjr9DCyjTAN58g/hw1k3s
-bMQeCzSJ3qm8sgqh4+9392ILbDZQqugaVRq5enVEp4EedZhKDm0OMDHkz4yos/sf
-FvHGJ9IJV7KNPgtKbIufVmElGstUEO75sAbJXKKf9RDF3mS3l10fW5PzUhd7QoPk
-bctnq2G1Fuc4XdZj51mxj/d3NE+guQENBDgbNloQBACMDd+3MOnocx85heT7zsiL
-wQznw0dA554+XKh7HNjpQOGaCtIgKbvXi56K1jblx5NVyaV1VmGL9woCUfG5lGME
-uJE0PbL4XlMEj1txa2yJQFQcNAiICrRfQgqQE1LZMht0fpXvwmbxdTqubsG2382V
-jXtGVrAv0l3jYIGWSTo+QwADBQP+JVwIi8Qv0AzMEhMcYovMVoidMGvSCtLoIeOQ
-J9KuQuKkoUhoW27oEJlYYC8XqEJ3sIQnYmc7fGaMjt+/QVr5Pq/g9iG5JTgWWCJe
-8zy/+upwzE0EN6W6TqKXOBsDsENMGIok58d59z7ykI3VQRmu7TfTM1QJHVImyALj
-7F0mph6IRgQYEQIABgUCOBs2WgAKCRCWJIPhVmLHNIEGAKCWcOaIYvLspRW11j2b
-qlFfyUDwnQCfTTs8DO0AFWVdMrwydOYSow2cI5o=
-=CfD6
------END PGP PUBLIC KEY BLOCK-----
diff --git a/test/testsources.list/sources.list.all-gpg-broken b/test/testsources.list/sources.list.all-gpg-broken
deleted file mode 100644
index 110f31884..000000000
--- a/test/testsources.list/sources.list.all-gpg-broken
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/gpg-package-broken/ /
-
diff --git a/test/testsources.list/sources.list.all-gpg-ok b/test/testsources.list/sources.list.all-gpg-ok
deleted file mode 100644
index 2e9a4458a..000000000
--- a/test/testsources.list/sources.list.all-gpg-ok
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/gpg-package-ok/ /
-
diff --git a/test/testsources.list/sources.list.all-release-broken b/test/testsources.list/sources.list.all-release-broken
deleted file mode 100644
index 5e138323a..000000000
--- a/test/testsources.list/sources.list.all-release-broken
+++ /dev/null
@@ -1 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/all-release-broken/ /
diff --git a/test/testsources.list/sources.list.all-release-ok b/test/testsources.list/sources.list.all-release-ok
deleted file mode 100644
index 8bcceeee8..000000000
--- a/test/testsources.list/sources.list.all-release-ok
+++ /dev/null
@@ -1 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/all-release-ok/ /
diff --git a/test/testsources.list/sources.list.all-validuntil-broken b/test/testsources.list/sources.list.all-validuntil-broken
deleted file mode 100644
index bab59bb81..000000000
--- a/test/testsources.list/sources.list.all-validuntil-broken
+++ /dev/null
@@ -1 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/all-validuntil-broken/ /
diff --git a/test/testsources.list/sources.list.md5-package-broken b/test/testsources.list/sources.list.md5-package-broken
deleted file mode 100644
index 3ba43181e..000000000
--- a/test/testsources.list/sources.list.md5-package-broken
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/md5-package-broken/ /
-
diff --git a/test/testsources.list/sources.list.md5-package-ok b/test/testsources.list/sources.list.md5-package-ok
deleted file mode 100644
index 9bf207780..000000000
--- a/test/testsources.list/sources.list.md5-package-ok
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/md5-package-ok/ /
-
diff --git a/test/testsources.list/sources.list.md5-release-broken b/test/testsources.list/sources.list.md5-release-broken
deleted file mode 100644
index 1c8f1dd79..000000000
--- a/test/testsources.list/sources.list.md5-release-broken
+++ /dev/null
@@ -1 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/md5-release-broken/ /
diff --git a/test/testsources.list/sources.list.md5-release-ok b/test/testsources.list/sources.list.md5-release-ok
deleted file mode 100644
index f27e04f16..000000000
--- a/test/testsources.list/sources.list.md5-release-ok
+++ /dev/null
@@ -1 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/md5-release-ok/ /
diff --git a/test/testsources.list/sources.list.sha1-release-broken b/test/testsources.list/sources.list.sha1-release-broken
deleted file mode 100644
index 29a277899..000000000
--- a/test/testsources.list/sources.list.sha1-release-broken
+++ /dev/null
@@ -1 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha1-release-broken/ /
diff --git a/test/testsources.list/sources.list.sha1-release-ok b/test/testsources.list/sources.list.sha1-release-ok
deleted file mode 100644
index 6f95d0247..000000000
--- a/test/testsources.list/sources.list.sha1-release-ok
+++ /dev/null
@@ -1 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha1-release-ok/ /
diff --git a/test/testsources.list/sources.list.sha256-package-broken b/test/testsources.list/sources.list.sha256-package-broken
deleted file mode 100644
index d6d284b9c..000000000
--- a/test/testsources.list/sources.list.sha256-package-broken
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha256-package-broken/ /
-
diff --git a/test/testsources.list/sources.list.sha256-package-ok b/test/testsources.list/sources.list.sha256-package-ok
deleted file mode 100644
index c2d7570d1..000000000
--- a/test/testsources.list/sources.list.sha256-package-ok
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha256-package-ok/ /
-
diff --git a/test/testsources.list/sources.list.sha256-release-broken b/test/testsources.list/sources.list.sha256-release-broken
deleted file mode 100644
index 713a4d9c8..000000000
--- a/test/testsources.list/sources.list.sha256-release-broken
+++ /dev/null
@@ -1 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha256-release-broken/ /
diff --git a/test/testsources.list/sources.list.sha256-release-ok b/test/testsources.list/sources.list.sha256-release-ok
deleted file mode 100644
index 93b44e366..000000000
--- a/test/testsources.list/sources.list.sha256-release-ok
+++ /dev/null
@@ -1 +0,0 @@
-deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha256-release-ok/ /