From 22eeef1809dae0594eca961783b1f809f4d539f7 Mon Sep 17 00:00:00 2001 From: John Feuerstein Date: Sat, 16 Jul 2011 14:37:52 +0200 Subject: * doc/apt-cache.8.xml: - apply madison typofix from John Feuerstein, thanks! (Closes: #633455) --- doc/apt-cache.8.xml | 2 +- doc/po/apt-doc.pot | 2 +- doc/po/de.po | 4 ++-- doc/po/es.po | 2 +- doc/po/fr.po | 2 +- doc/po/ja.po | 4 ++-- doc/po/pl.po | 4 ++-- doc/po/pt.po | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'doc') diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 431ef8704..1393de015 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -263,7 +263,7 @@ Reverse Provides: about the priority selection of the named package. - madison /[ pkg(s) ] + madison [ pkg(s) ] apt-cache's madison command attempts to mimic the output format and a subset of the functionality of the Debian archive management tool, madison. It displays diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 47a7c38d7..2a4eef558 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -928,7 +928,7 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:266 -msgid "madison /[ pkg(s) ]" +msgid "madison [ pkg(s) ]" msgstr "" #. type: Content of: diff --git a/doc/po/de.po b/doc/po/de.po index dc4d34b81..196305bf9 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -1230,8 +1230,8 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:266 -msgid "madison /[ pkg(s) ]" -msgstr "madison /[ Paket(e) ]" +msgid "madison [ pkg(s) ]" +msgstr "madison [ Paket(e) ]" #. type: Content of: #: apt-cache.8.xml:267 diff --git a/doc/po/es.po b/doc/po/es.po index c8fdc9fed..ad7d02109 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -1303,7 +1303,7 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:266 -msgid "madison /[ pkg(s) ]" +msgid "madison [ pkg(s) ]" msgstr "madison [ paquete(s) ]" #. type: Content of: diff --git a/doc/po/fr.po b/doc/po/fr.po index 6e3977c43..f5273f639 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -1225,7 +1225,7 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:266 -msgid "madison /[ pkg(s) ]" +msgid "madison [ pkg(s) ]" msgstr "madison [ paquet(s) ]" #. type: Content of: diff --git a/doc/po/ja.po b/doc/po/ja.po index 8a75af980..d27bc1b64 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -1304,8 +1304,8 @@ msgstr "" # type: Content of: #. type: Content of: #: apt-cache.8.xml:266 -msgid "madison /[ pkg(s) ]" -msgstr "madison /[ pkg(s) ]" +msgid "madison [ pkg(s) ]" +msgstr "madison [ pkg(s) ]" # type: Content of: #. type: Content of: diff --git a/doc/po/pl.po b/doc/po/pl.po index b74746ffc..6afced6cf 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -1311,8 +1311,8 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:266 -msgid "madison /[ pkg(s) ]" -msgstr "madison /[ pakiet(y) ]" +msgid "madison [ pkg(s) ]" +msgstr "madison [ pakiet(y) ]" # #. type: Content of: diff --git a/doc/po/pt.po b/doc/po/pt.po index 6fd27a5c3..f0bfea56d 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -1255,8 +1255,8 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:266 -msgid "madison /[ pkg(s) ]" -msgstr "madison /[ pacote(s) ]" +msgid "madison [ pkg(s) ]" +msgstr "madison [ pacote(s) ]" #. type: Content of: #: apt-cache.8.xml:267 -- cgit v1.2.3 From 234675b71a2caab5c7cc0dc3b32a241683d3b3d2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 25 Jul 2011 14:40:22 +0200 Subject: implement MultiarchCross for build-dep and source (Closes: #632221) --- doc/apt-get.8.xml | 27 ++++++++++++++++++++++++--- doc/examples/configure-index | 1 + 2 files changed, 25 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 11b53e5e7..9d901b492 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -54,6 +54,13 @@ target_release + + + + default_architecture + + + update @@ -254,8 +261,10 @@ If the option is specified then the package will be compiled to a binary .deb using - dpkg-buildpackage, if - is specified then the source package will not be unpacked. + dpkg-buildpackage for the architecture as + defined by the --host-architecture option. + If is specified then the source package + will not be unpacked. 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 @@ -270,7 +279,9 @@ build-dep build-dep 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 instead. check @@ -433,6 +444,16 @@ Configuration Item: APT::Get::Show-Versions. + + + This option controls the architecture packages are built for + by apt-get source --compile 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 APT::Architecture) + Configuration Item: APT::Get::Host-Architecture + + + Compile source packages after downloading them. diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 27232d40b..49e803f91 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -32,6 +32,7 @@ APT // Options for apt-get Get { + Host-Architecture "armel"; Arch-Only "false"; AllowUnauthenticated "false"; AutomaticRemove "false"; -- cgit v1.2.3 From 27b16a2ed9a5cfdde955a0a49cd2fd73edce09c8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 26 Jul 2011 12:10:00 +0200 Subject: refresh po/* --- doc/po/it.po | 2 +- doc/po/pt_BR.po | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/po/it.po b/doc/po/it.po index 514e24442..4535a794f 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -893,7 +893,7 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:266 -msgid "madison /[ pkg(s) ]" +msgid "madison [ pkg(s) ]" msgstr "" #. type: Content of: diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 0f171479f..d447a4701 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -943,8 +943,11 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:266 -msgid "madison /[ pkg(s) ]" +#, fuzzy +msgid "madison [ pkg(s) ]" msgstr "" +"\n" +"apt-get install pacote/testing\n" #. type: Content of: #: apt-cache.8.xml:267 -- cgit v1.2.3